Re: [Qemu-devel] [PATCH v2 40/40] trace: split out trace events for linux-user/ directory

[Laurent Vivier]

Le 16/06/2016 à 10:40, Daniel P. Berrange a écrit :
> Move all trace-events for files in the linux-user/ directory to
> their own file.
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>

Reviewed-by: Laurent Vivier <address@hidden>

> ---
>  Makefile.objs           |  1 +
>  linux-user/trace-events | 12 ++++++++++++
>  trace-events            | 11 -----------
>  3 files changed, 13 insertions(+), 11 deletions(-)
>  create mode 100644 linux-user/trace-events
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 9f2c260..7f1f0a3 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -157,3 +157,4 @@ trace-events-y += target-sparc/trace-events
>  trace-events-y += target-s390x/trace-events
>  trace-events-y += target-ppc/trace-events
>  trace-events-y += qom/trace-events
> +trace-events-y += linux-user/trace-events
> diff --git a/linux-user/trace-events b/linux-user/trace-events
> new file mode 100644
> index 0000000..80a2e07
> --- /dev/null
> +++ b/linux-user/trace-events
> @@ -0,0 +1,12 @@
> +# See docs/trace-events.txt for syntax documentation.
> +
> +# 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_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
> diff --git a/trace-events b/trace-events
> index be4f217..8df1827 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -135,14 +135,3 @@ memory_region_subpage_read(int cpu_index, void *mr, 
> uint64_t offset, uint64_t va
>  memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, 
> uint64_t value, unsigned size) "cpu %d mr %p offset %#"PRIx64" value 
> %#"PRIx64" size %u"
>  memory_region_tb_read(int cpu_index, uint64_t addr, uint64_t value, unsigned 
> size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"
>  memory_region_tb_write(int cpu_index, uint64_t addr, uint64_t value, 
> unsigned size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"
> -
> -# 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_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
>