@@ -58,7 +58,6 @@ def generate(events, backend):
out('extern uint16_t dstate[TRACE_EVENT_COUNT];')
out('extern bool dstate_init[TRACE_EVENT_COUNT];')
- out('#include "trace/event-internal.h"',
- 'void trace_register_events(void);',
+ out('void trace_register_events(void);',
'',
'#endif /* TRACE__GENERATED_EVENTS_H */')
@@ -24,6 +24,7 @@ def generate(events, backend):
'',
'#include "qemu-common.h"',
'#include "trace/control.h"',
+ '#include "trace/generated-events.h"',
'')
backend.generate_begin(events)
@@ -11,7 +11,7 @@
#define TRACE__CONTROL_H
#include "qemu-common.h"
-#include "trace/generated-events.h"
+#include "event-internal.h"
typedef struct TraceEventIter {
size_t event;
@@ -10,9 +10,6 @@
#ifndef TRACE__EVENT_INTERNAL_H
#define TRACE__EVENT_INTERNAL_H
-#include "trace/generated-events.h"
-
-
/**
* TraceEvent:
* @id: Unique event identifier.
@@ -11,10 +11,6 @@
#ifndef TRACE_SIMPLE_H
#define TRACE_SIMPLE_H
-
-#include "trace/generated-events.h"
-
-
void st_print_trace_file_status(FILE *stream, fprintf_function stream_printf);
void st_set_trace_file_enabled(bool enable);
void st_set_trace_file(const char *file);
Now that none of the public APIs rely on the TraceEventID enum, or related constants, it is possible to simplify the includes, dropping generated-events.h from many of them. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- scripts/tracetool/format/events_h.py | 3 +-- scripts/tracetool/format/h.py | 1 + trace/control.h | 2 +- trace/event-internal.h | 3 --- trace/simple.h | 4 ---- 5 files changed, 3 insertions(+), 10 deletions(-)