| Message ID | 1450954698-12733-1-git-send-email-valentin.rakush@gmail.com |
|---|---|
| State | New |
| Headers | show |
valentin <valentin.rakush@gmail.com> writes: Please disregard this patch. The patch from Mark Cave-Ayland, dated December 20, 2015 already fixed this issue. > From: Valentin Rakush <valentin.rakush@gmail.com> > > This patch fixes compilation errors when --enable-trace-backend=stderr option is used for configuration > > GEN trace/generated-events.c > CC trace/generated-events.o > In file included from /home/vrakush/workspace/qemu/include/trace.h:4:0, > from trace/generated-events.c:3: > ./trace/generated-tracers.h: In function ‘trace_user_setup_frame’: > ./trace/generated-tracers.h:17455:25: error: too many arguments for format [-Werror=format-extra-args] > , env, frame_addr); > ^ > > Signed-off-by: Valentin Rakush <valentin.rakush@gmail.com> > > --- > trace-events | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/trace-events b/trace-events > index 6f03638..73d2537 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" > -- > 1.8.3.1
diff --git a/trace-events b/trace-events index 6f03638..73d2537 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"