| Message ID | 1452008255-13068-1-git-send-email-drjones@redhat.com |
|---|---|
| State | New |
| Headers | show |
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>
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
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"
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
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
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"
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(-)