[Qemu-devel] [PATCH] trace-events: fix broken format strings

[Qemu-devel] [PATCH] trace-events: fix broken format strings

[Andrew Jones]

Fixes compiling with --enable-trace-backends

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
 trace-events | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/trace-events b/trace-events
index 6f036384a84f8..e42898d5659d5 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=0x%"PRIx64""
+user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
+user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
+user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"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 0x%"PRIx64 " current psw.addr 0x%"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.4.3

Re: [Qemu-devel] [PATCH] trace-events: fix broken format strings

[Laurent Vivier]

On 05/01/2016 14:20, Andrew Jones wrote:
> Fixes compiling with --enable-trace-backends
> 
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
>  trace-events | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/trace-events b/trace-events
> index 6f036384a84f8..e42898d5659d5 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=0x%"PRIx64""
> +user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
> +user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
> +user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""

I think there are too many quotes. This looks more correct:

"env=%p frame_addr=0x%"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 0x%"PRIx64 " current psw.addr 0x%"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"
> 

Re: [Qemu-devel] [PATCH] trace-events: fix broken format strings

[Andrew Jones]

On Tue, Jan 05, 2016 at 03:54:48PM +0100, Laurent Vivier wrote:
> 
> 
> On 05/01/2016 14:20, Andrew Jones wrote:
> > Fixes compiling with --enable-trace-backends
> > 
> > Signed-off-by: Andrew Jones <drjones@redhat.com>
> > ---
> >  trace-events | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/trace-events b/trace-events
> > index 6f036384a84f8..e42898d5659d5 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=0x%"PRIx64""
> > +user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
> > +user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
> > +user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64""
> 
> I think there are too many quotes. This looks more correct:
> 
> "env=%p frame_addr=0x%"PRIx64

You're right. The trailing null strings don't break compilation, but don't do
anything either.

I'll send a v2 with those removed.

Thanks,
drew

> 
> >  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 0x%"PRIx64 " current psw.addr 0x%"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"
> > 
> 

Re: [Qemu-devel] [PATCH] trace-events: fix broken format strings

[Eric Blake]

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

On 01/05/2016 08:24 AM, Andrew Jones wrote:

>>
>> I think there are too many quotes. This looks more correct:
>>
>> "env=%p frame_addr=0x%"PRIx64
> 
> You're right. The trailing null strings don't break compilation, but don't do
> anything either.
> 
> I'll send a v2 with those removed.
> 

No need; it is already posted here:
https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg03667.html

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]