summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGreg Kurz <groug@kaod.org>2016-11-17 14:59:13 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2016-11-18 11:09:58 +0000
commitd4f7ca59017835784c6872dfab0e269d9b41b05a (patch)
treee00a79b71ba9b2a9cbc55a261f9cced02011f6dd
parentb0bcc86d2a87456f5a276f941dc775b265b309cf (diff)
downloadfocaccia-qemu-d4f7ca59017835784c6872dfab0e269d9b41b05a.tar.gz
focaccia-qemu-d4f7ca59017835784c6872dfab0e269d9b41b05a.zip
trace: fix generated code build break
If the QEMU source dir is

    /var/tmp/aaa-qemu-clone

and the build dir is

    /var/tmp/qemu-aio-poll-v2

Then I get an error as:

trace/generated-tracers.c:15950:13: error: invalid suffix "_trace_events"
 on integer constant
 TraceEvent *2_trace_events[] = {
             ^
trace/generated-tracers.c:15950:13: error: expected identifier or ‘(’ before
 numeric constant
trace/generated-tracers.c: In function ‘trace_2_register_events’:
trace/generated-tracers.c:17949:32: error: invalid suffix "_trace_events" on
 integer constant
     trace_event_register_group(2_trace_events);
                                ^
make: *** [trace/generated-tracers.o] Error 1

This patch fixes the issue.

Reported-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
Tested-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rwxr-xr-xscripts/tracetool.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index fe9c9e904b..c9e47371d3 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -70,7 +70,7 @@ def make_group_name(filename):
 
     if dirname == "":
         return "common"
-    return re.sub(r"[^A-Za-z0-9]", "_", dirname)
+    return "_" + re.sub(r"[^A-Za-z0-9]", "_", dirname)
 
 def main(args):
     global _SCRIPT