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/virtio | |
| parent | 5619c179057e24195ff19c8fe6d6a6cbcb16ed28 (diff) | |
| parent | bd6952a391b6f2083d6597386f457f30044e32a3 (diff) | |
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/virtio')
| -rw-r--r-- | hw/virtio/trace-events | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 012bbaa694..775461ae98 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -20,8 +20,8 @@ virtio_rng_vm_state_change(void *rng, int running, int state) "rng %p: state cha # hw/virtio/virtio-balloon.c # -virtio_balloon_bad_addr(uint64_t gpa) "%"PRIx64 -virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s gpa: %"PRIx64 +virtio_balloon_bad_addr(uint64_t gpa) "0x%"PRIx64 +virtio_balloon_handle_output(const char *name, uint64_t gpa) "section name: %s gpa: 0x%"PRIx64 virtio_balloon_get_config(uint32_t num_pages, uint32_t actual) "num_pages: %d actual: %d" virtio_balloon_set_config(uint32_t actual, uint32_t oldactual) "actual: %d oldactual: %d" -virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: %"PRIx64" num_pages: %d" +virtio_balloon_to_target(uint64_t target, uint32_t num_pages) "balloon target: 0x%"PRIx64" num_pages: %d" |