[Qemu-devel] [PATCH] Fix wrong format specifiers in trace events

[Qemu-devel] [PATCH] Fix wrong format specifiers in trace events

[Stefan Weil]

* Add missing % before PRIx64
* Remove unneeded "" at end of format string in modified lines

This fixes a regression introduced in commit
c8ee0a445a6a85635e962c0346bc7b1259c1a3f5.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

The patch should also be used for v2.5.1.

Happy New Year!
Stefan

 trace-events | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/trace-events b/trace-events
index 6f03638..10d17bb 100644
--- a/trace-events
+++ b/trace-events
@@ -1799,15 +1799,15 @@ qcrypto_tls_session_new(void *session, void *creds, const char *hostname, const
 vhost_user_event(const char *chr, int event) "chr: %s got event: %d"
 
 # linux-user/signal.c
-user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64""
-user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64""
-user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64""
-user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr="PRIx64""
+user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64
+user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64
+user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64
+user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64
 user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)"
 user_handle_signal(void *env, int target_sig) "env=%p signal %d"
 user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d("
 user_queue_signal(void *env, int target_sig) "env=%p signal %d"
-user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr "PRIx64 " current psw.addr "PRIx64""
+user_s390x_restore_sigregs(void *env, uint64_t sc_psw_addr, uint64_t env_psw_addr) "env=%p frame psw.addr %"PRIx64 " current psw.addr %"PRIx64
 
 # io/task.c
 qio_task_new(void *task, void *source, void *func, void *opaque) "Task new task=%p source=%p func=%p opaque=%p"
-- 
2.1.4

Re: [Qemu-devel] [PATCH] Fix wrong format specifiers in trace events

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 618 bytes --]

On Tue, Dec 29, 2015 at 02:53:34PM +0100, Stefan Weil wrote:
> * Add missing % before PRIx64
> * Remove unneeded "" at end of format string in modified lines
> 
> This fixes a regression introduced in commit
> c8ee0a445a6a85635e962c0346bc7b1259c1a3f5.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> 
> The patch should also be used for v2.5.1.
> 
> Happy New Year!

Thanks!

I've already merged Mark Cave-Ayland's patch.  Sorry for the duplicated
work, I was away and didn't send a pull request.

https://github.com/stefanha/qemu/commit/c6daed8654bb1a4d085d9229e5a7dd5363794180

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]