* [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
@ 2016-01-05 15:37 Andrew Jones
2016-01-05 15:39 ` Laurent Vivier
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Andrew Jones @ 2016-01-05 15:37 UTC (permalink / raw)
To: qemu-devel; +Cc: lvivier, pbonzini
Fixes compiling with --enable-trace-backends
Signed-off-by: Andrew Jones <drjones@redhat.com>
---
v2: also remove trailing null strings [Laurent]
trace-events | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/trace-events b/trace-events
index 6f036384a84f8..98ec748270a39 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
2016-01-05 15:37 [Qemu-devel] [PATCH v2] trace-events: fix broken format strings Andrew Jones
@ 2016-01-05 15:39 ` Laurent Vivier
2016-01-05 15:50 ` Eric Blake
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2016-01-05 15:39 UTC (permalink / raw)
To: Andrew Jones, qemu-devel; +Cc: pbonzini, Mark Cave-Ayland, Greg Kurz
On 05/01/2016 16:37, Andrew Jones wrote:
> Fixes compiling with --enable-trace-backends
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> v2: also remove trailing null strings [Laurent]
>
>
> trace-events | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/trace-events b/trace-events
> index 6f036384a84f8..98ec748270a39 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"
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
2016-01-05 15:37 [Qemu-devel] [PATCH v2] trace-events: fix broken format strings Andrew Jones
2016-01-05 15:39 ` Laurent Vivier
@ 2016-01-05 15:50 ` Eric Blake
2016-01-07 4:34 ` Stefan Hajnoczi
2016-01-05 16:21 ` Greg Kurz
2016-01-06 9:25 ` Alex Bennée
3 siblings, 1 reply; 6+ messages in thread
From: Eric Blake @ 2016-01-05 15:50 UTC (permalink / raw)
To: Andrew Jones, qemu-devel; +Cc: lvivier, pbonzini
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
On 01/05/2016 08:37 AM, Andrew Jones wrote:
> Fixes compiling with --enable-trace-backends
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> v2: also remove trailing null strings [Laurent]
>
>
> trace-events | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Duplicate of:
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 --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
2016-01-05 15:37 [Qemu-devel] [PATCH v2] trace-events: fix broken format strings Andrew Jones
2016-01-05 15:39 ` Laurent Vivier
2016-01-05 15:50 ` Eric Blake
@ 2016-01-05 16:21 ` Greg Kurz
2016-01-06 9:25 ` Alex Bennée
3 siblings, 0 replies; 6+ messages in thread
From: Greg Kurz @ 2016-01-05 16:21 UTC (permalink / raw)
To: Andrew Jones; +Cc: lvivier, pbonzini, qemu-devel, Peter Maydell
Cc'ing Peter because we'd like this patch to go directly to the master branch.
On Tue, 5 Jan 2016 16:37:35 +0100
Andrew Jones <drjones@redhat.com> wrote:
> Fixes compiling with --enable-trace-backends
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> v2: also remove trailing null strings [Laurent]
>
>
Reviewed-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
> trace-events | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/trace-events b/trace-events
> index 6f036384a84f8..98ec748270a39 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"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
2016-01-05 15:37 [Qemu-devel] [PATCH v2] trace-events: fix broken format strings Andrew Jones
` (2 preceding siblings ...)
2016-01-05 16:21 ` Greg Kurz
@ 2016-01-06 9:25 ` Alex Bennée
3 siblings, 0 replies; 6+ messages in thread
From: Alex Bennée @ 2016-01-06 9:25 UTC (permalink / raw)
To: Andrew Jones; +Cc: lvivier, pbonzini, qemu-devel
Andrew Jones <drjones@redhat.com> writes:
> Fixes compiling with --enable-trace-backends
>
> Signed-off-by: Andrew Jones <drjones@redhat.com>
> ---
> v2: also remove trailing null strings [Laurent]
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
>
>
> trace-events | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/trace-events b/trace-events
> index 6f036384a84f8..98ec748270a39 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"
--
Alex Bennée
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v2] trace-events: fix broken format strings
2016-01-05 15:50 ` Eric Blake
@ 2016-01-07 4:34 ` Stefan Hajnoczi
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2016-01-07 4:34 UTC (permalink / raw)
To: Eric Blake; +Cc: lvivier, pbonzini, Andrew Jones, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
On Tue, Jan 05, 2016 at 08:50:45AM -0700, Eric Blake wrote:
> On 01/05/2016 08:37 AM, Andrew Jones wrote:
> > Fixes compiling with --enable-trace-backends
> >
> > Signed-off-by: Andrew Jones <drjones@redhat.com>
> > ---
> > v2: also remove trailing null strings [Laurent]
> >
> >
> > trace-events | 10 +++++-----
> > 1 file changed, 5 insertions(+), 5 deletions(-)
>
> Duplicate of:
> https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg03667.html
I have merged Mark Cave-Ayland's patch and am sending a pull request
today.
Stefan
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-01-07 4:34 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-05 15:37 [Qemu-devel] [PATCH v2] trace-events: fix broken format strings Andrew Jones
2016-01-05 15:39 ` Laurent Vivier
2016-01-05 15:50 ` Eric Blake
2016-01-07 4:34 ` Stefan Hajnoczi
2016-01-05 16:21 ` Greg Kurz
2016-01-06 9:25 ` Alex Bennée
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.