diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-01 14:33:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-01 14:33:56 +0100 |
| commit | 7d48cf8102a10e4a54333811bafb5eb566509268 (patch) | |
| tree | ce8ca13de13a97932e62489c79a949955ef1bb51 /hw/xen | |
| parent | 5619c179057e24195ff19c8fe6d6a6cbcb16ed28 (diff) | |
| parent | bd6952a391b6f2083d6597386f457f30044e32a3 (diff) | |
| download | qemu-7d48cf8102a10e4a54333811bafb5eb566509268.zip qemu-7d48cf8102a10e4a54333811bafb5eb566509268.tar.gz qemu-7d48cf8102a10e4a54333811bafb5eb566509268.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
Fixes for inconsistencies in the trace event format strings, broken
trace_event_get_state() usage, and handle_qmp_command() fix.
# gpg: Signature made Tue 01 Aug 2017 14:16:05 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
monitor: Reduce handle_qmp_command() tracing overhead
trace-events: fix code style: print 0x before hex numbers
checkpatch: check trace-events code style
trace-events: fix code style: %# -> 0x%
coding_style: add point about 0x in trace-events
trace: add trace_event_get_state_backends()
trace: add TRACE_<event>_BACKEND_DSTATE()
trace: ensure unique function / variable names per .stp file
trace: ensure .stp files are rebuilt if trace tool source changes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/xen')
| -rw-r--r-- | hw/xen/trace-events | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xen/trace-events b/hw/xen/trace-events index bff4f23..c7e7a3b 100644 --- a/hw/xen/trace-events +++ b/hw/xen/trace-events @@ -5,10 +5,10 @@ xen_default_ioreq_server(void) "" xen_ioreq_server_create(uint32_t id) "id: %u" xen_ioreq_server_destroy(uint32_t id) "id: %u" xen_ioreq_server_state(uint32_t id, bool enable) "id: %u: enable: %i" -xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 -xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 -xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 -xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 +xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: 0x%"PRIx64" end: 0x%"PRIx64 +xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: 0x%"PRIx64" end: 0x%"PRIx64 +xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: 0x%"PRIx64" end: 0x%"PRIx64 +xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: 0x%"PRIx64" end: 0x%"PRIx64 xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" xen_domid_restrict(int err) "err: %u" |