• D
    e1000e: Fix build with ust trace backend · defbaec1
    Dmitry Fleytman 提交于
    ust trace backend has limitation of maximum 10
    arguments per event. Traces with more arguments
    cannot be compiled for this backend.
    
    Trace e1000e_rx_rss_ip6 introduced by previous
    commits has 11 arguments and fails to compile with
    ust trace backend.
    
    This patch fixes the problem by splitting this
    tracepoint into two successive tracepoints with
    smaller number of arguments.
    
    For more information see comment regarding TP_ARGS
    in lttng/tracepoint.h:
    
    /*
    * TP_ARGS takes tuples of type, argument separated by a comma.
    * It can take up to 10 tuples (which means that less than 10 tuples is
    * fine too).
    * Each tuple is also separated by a comma.
    */
    
    Build log generated by this problem:
    
    In file included from ./trace/generated-tracers.h:9:0,
                     from /home/travis/build/qemu/qemu/include/trace.h:4,
                     from util/oslib-posix.c:36:
    ./trace/generated-ust-provider.h:16556:3: error: unknown type name ‘_TP_EXPROTO_Bool’
    In file included from /home/travis/build/qemu/qemu/include/trace.h:4:0,
                     from util/oslib-posix.c:36:
    ./trace/generated-tracers.h: In function ‘trace_e1000e_rx_rss_ip6’:
    ./trace/generated-tracers.h:8379:431: error: expected string literal before ‘_SDT_ASM_OPERANDS_ipv6_enabled’
    ./trace/generated-tracers.h:8379:431: error: implicit declaration of function ‘__tracepoint_cb_qemu___e1000e_rx_rss_ip6’ [-Werror=implicit-function-declaration]
    ./trace/generated-tracers.h:8379:431: error: nested extern declaration of ‘__tracepoint_cb_qemu___e1000e_rx_rss_ip6’ [-Werror=nested-externs]
    cc1: all warnings being treated as errors
    make: *** [util/oslib-posix.o] Error 1
    make: *** Waiting for unfinished jobs....
    In file included from ./trace/generated-tracers.h:9:0,
                     from /home/travis/build/qemu/qemu/include/trace.h:4,
                     from util/hbitmap.c:16:
    ./trace/generated-ust-provider.h:16556:3: error: unknown type name ‘_TP_EXPROTO_Bool’
    In file included from /home/travis/build/qemu/qemu/include/trace.h:4:0,
                     from util/hbitmap.c:16:
    ./trace/generated-tracers.h: In function ‘trace_e1000e_rx_rss_ip6’:
    ./trace/generated-tracers.h:8379:431: error: expected string literal before ‘_SDT_ASM_OPERANDS_ipv6_enabled’
    ./trace/generated-tracers.h:8379:431: error: implicit declaration of function ‘__tracepoint_cb_qemu___e1000e_rx_rss_ip6’ [-Werror=implicit-function-declaration]
    ./trace/generated-tracers.h:8379:431: error: nested extern declaration of ‘__tracepoint_cb_qemu___e1000e_rx_rss_ip6’ [-Werror=nested-externs]
    cc1: all warnings being treated as errors
    make: *** [util/hbitmap.o] Error 1
    Signed-off-by: NDmitry Fleytman <dmitry@daynix.com>
    Message-id: 1464894748-27803-1-git-send-email-dmitry@daynix.com
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    defbaec1
trace-events 146.6 KB