[Qemu-devel] [PATCH for-2.8 v1 13/60] trace: remove generated-events.h from many includes

["Daniel P. Berrange" <berrange@redhat.com>]

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(-)

diff --git a/scripts/tracetool/format/events_h.py b/scripts/tracetool/format/events_h.py
index d6465d4..a0fe0c4 100644
--- a/scripts/tracetool/format/events_h.py
+++ b/scripts/tracetool/format/events_h.py
@@ -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 */')
diff --git a/scripts/tracetool/format/h.py b/scripts/tracetool/format/h.py
index 3763e9a..2b82b91 100644
--- a/scripts/tracetool/format/h.py
+++ b/scripts/tracetool/format/h.py
@@ -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)
diff --git a/trace/control.h b/trace/control.h
index 242fcf3..8ff0a8f 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -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;
diff --git a/trace/event-internal.h b/trace/event-internal.h
index 618d1b5..3e563fc 100644
--- a/trace/event-internal.h
+++ b/trace/event-internal.h
@@ -10,9 +10,6 @@
 #ifndef TRACE__EVENT_INTERNAL_H
 #define TRACE__EVENT_INTERNAL_H
 
-#include "trace/generated-events.h"
-
-
 /**
  * TraceEvent:
  * @id: Unique event identifier.
diff --git a/trace/simple.h b/trace/simple.h
index 862bbc7..551aaae 100644
--- a/trace/simple.h
+++ b/trace/simple.h
@@ -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);
-- 
2.7.4