Re: [Qemu-devel] [PATCH 2/3] trace: [ust] Do not use 'm' in event argument names (used by ust macros)

[Stefan Hajnoczi <stefanha@gmail.com>]

On Fri, Sep 16, 2011 at 06:59:38PM +0200, Lluís Vilanova wrote:
> Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
> ---
>  trace-events |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/trace-events b/trace-events
> index 9d1fbbb..b653d70 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -418,8 +418,8 @@ milkymist_pfpu_pulse_irq(void) "Pulse IRQ"
>  # hw/milkymist-softusb.c
>  milkymist_softusb_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
>  milkymist_softusb_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x"
> -milkymist_softusb_mevt(uint8_t m) "m %d"
> -milkymist_softusb_kevt(uint8_t m) "m %d"
> +milkymist_softusb_mevt(uint8_t _m) "m %d"
> +milkymist_softusb_kevt(uint8_t _m) "m %d"

Do you also see errors with trace events that have no arguments?

DECLARE_TRACE(ust_qemu_co_queue_next_bh, TP_PROTO(void), TP_ARGS());

In file included from osdep.c:48:0:
trace.h: In function ‘__trace_ust_qemu_co_queue_next_bh’:
trace.h:1030:195: error: ‘void’ must be the only parameter
trace.h:1030:661: error: expected expression before ‘)’ token
trace.h:1030:661: error: too many arguments to function ‘(void (*)(void *))__tp_it_func’
trace.h: At top level:
trace.h:1030:661: error: ‘void’ must be the only parameter
trace.h:1030:661: error: ‘void’ must be the only parameter

On my box this can be fixed by changing the DEFINE_TRACE() like this:

DECLARE_TRACE(ust_qemu_co_queue_next_bh, TP_PROTO(), TP_ARGS());

I haven't looked into the details yet but wanted to check.  I suspect that different versions of libust might have different quirks here.

Stefan