@@ -6,10 +6,8 @@
#include "trace/control.h"
-extern TraceEvent _TRACE_TEST_BLAH_EVENT;
-extern TraceEvent _TRACE_TEST_WIBBLE_EVENT;
-extern uint8_t _TRACE_TEST_BLAH_DSTATE;
-extern uint8_t _TRACE_TEST_WIBBLE_DSTATE;
+#define _TRACE_TEST_BLAH_DSTATE 0
+#define _TRACE_TEST_WIBBLE_DSTATE 0
#define TRACE_TEST_BLAH_ENABLED 1
#define TRACE_TEST_WIBBLE_ENABLED 1
@@ -5,32 +5,3 @@
#include "qemu/module.h"
#include "trace-testsuite.h"
-uint8_t _TRACE_TEST_BLAH_DSTATE;
-uint8_t _TRACE_TEST_WIBBLE_DSTATE;
-TraceEvent _TRACE_TEST_BLAH_EVENT = {
-#ifdef CONFIG_TRACE_SIMPLE
- .id = 0,
-#endif
- .name = "test_blah",
- .sstate = TRACE_TEST_BLAH_ENABLED,
- .dstate = &_TRACE_TEST_BLAH_DSTATE
-};
-TraceEvent _TRACE_TEST_WIBBLE_EVENT = {
-#ifdef CONFIG_TRACE_SIMPLE
- .id = 0,
-#endif
- .name = "test_wibble",
- .sstate = TRACE_TEST_WIBBLE_ENABLED,
- .dstate = &_TRACE_TEST_WIBBLE_DSTATE
-};
-TraceEvent *testsuite_trace_events[] = {
- &_TRACE_TEST_BLAH_EVENT,
- &_TRACE_TEST_WIBBLE_EVENT,
- NULL,
-};
-
-static void trace_testsuite_register_events(void)
-{
- trace_event_register_group(testsuite_trace_events);
-}
-trace_init(trace_testsuite_register_events)
@@ -29,41 +29,42 @@ def generate(events, backend, group):
'#include "%s"' % header,
'')
- for e in events:
- out('uint8_t %s;' % e.api(e.QEMU_DSTATE))
+ if len(list(backend.backend_modules())):
+ for e in events:
+ out('uint8_t %s;' % e.api(e.QEMU_DSTATE))
- for e in events:
- out('TraceEvent %(event)s = {',
- '#ifdef CONFIG_TRACE_SIMPLE',
- ' .id = 0,',
- '#endif',
- ' .name = \"%(name)s\",',
- ' .sstate = %(sstate)s,',
- ' .dstate = &%(dstate)s',
+ for e in events:
+ out('TraceEvent %(event)s = {',
+ '#ifdef CONFIG_TRACE_SIMPLE',
+ ' .id = 0,',
+ '#endif',
+ ' .name = \"%(name)s\",',
+ ' .sstate = %(sstate)s,',
+ ' .dstate = &%(dstate)s',
+ '};',
+ event = e.api(e.QEMU_EVENT),
+ name = e.name,
+ sstate = "TRACE_%s_ENABLED" % e.name.upper(),
+ dstate = e.api(e.QEMU_DSTATE))
+
+ out('TraceEvent *%(group)s_trace_events[] = {',
+ group = group.lower())
+
+ for e in events:
+ out(' &%(event)s,', event = e.api(e.QEMU_EVENT))
+
+ out(' NULL,',
'};',
- event = e.api(e.QEMU_EVENT),
- name = e.name,
- sstate = "TRACE_%s_ENABLED" % e.name.upper(),
- dstate = e.api(e.QEMU_DSTATE))
+ '')
- out('TraceEvent *%(group)s_trace_events[] = {',
- group = group.lower())
+ out('static void trace_%(group)s_register_events(void)',
+ '{',
+ ' trace_event_register_group(%(group)s_trace_events);',
+ '}',
+ 'trace_init(trace_%(group)s_register_events)',
+ group = group.lower())
- for e in events:
- out(' &%(event)s,', event = e.api(e.QEMU_EVENT))
-
- out(' NULL,',
- '};',
- '')
-
- out('static void trace_%(group)s_register_events(void)',
- '{',
- ' trace_event_register_group(%(group)s_trace_events);',
- '}',
- 'trace_init(trace_%(group)s_register_events)',
- group = group.lower())
-
- backend.generate_begin(active_events, group)
- for event in active_events:
- backend.generate(event, group)
- backend.generate_end(active_events, group)
+ backend.generate_begin(active_events, group)
+ for event in active_events:
+ backend.generate(event, group)
+ backend.generate_end(active_events, group)
@@ -27,12 +27,16 @@ def generate(events, backend, group):
'#include "%s"' % header,
'')
- for e in events:
- out('extern TraceEvent %(event)s;',
- event = e.api(e.QEMU_EVENT))
+ if len(list(backend.backend_modules())):
+ for e in events:
+ out('extern TraceEvent %(event)s;',
+ event = e.api(e.QEMU_EVENT))
- for e in events:
- out('extern uint8_t %s;' % e.api(e.QEMU_DSTATE))
+ for e in events:
+ out('extern uint8_t %s;' % e.api(e.QEMU_DSTATE))
+ else:
+ for e in events:
+ out('#define %s 0' % e.api(e.QEMU_DSTATE))
# static state
for e in events: