path: root/trace
diff options
authorDaniel P. Berrange <berrange@redhat.com>2016-10-04 14:35:47 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2016-10-12 09:35:54 +0200
commita82417b50bc80310b6294ae2698303c3d67f900c (patch)
tree8ba8bf883aab5d459df012910bb3283bc0cc341e /trace
parent99672c7167cdee40e7d81e3c8b691b19ae408816 (diff)
trace: break circular dependency in event-internal.h
Currently event-internal.h includes generated-events.h, while generated-events.h includes event-internal.h causing a circular dependency. event-internal.h requires that the content of generated-events.h comes first, so that it can see the typedefs for TraceEventID and TraceEventVCPUID. Switching the TraceEvent struct to use uint32_t for the two ID fields removes the dependency on the typedef, allowing events-internal.h to be a self-contained header. This will then let the patch following this move event-internal.h to the top of generated-events.h, so we can expose TraceEvent struct variables in generated-events.h Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: LluĂ­s Vilanova <vilanova@ac.upc.edu> Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 1475588159-30598-9-git-send-email-berrange@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'trace')
1 files changed, 2 insertions, 5 deletions
diff --git a/trace/event-internal.h b/trace/event-internal.h
index 4a98d09153..58f0551745 100644
--- a/trace/event-internal.h
+++ b/trace/event-internal.h
@@ -10,9 +10,6 @@
-#include "trace/generated-events.h"
* TraceEvent:
* @id: Unique event identifier.
@@ -29,8 +26,8 @@
* Opaque generic description of a tracing event.
typedef struct TraceEvent {
- TraceEventID id;
- TraceEventVCPUID vcpu_id;
+ uint32_t id;
+ uint32_t vcpu_id;
const char * name;
const bool sstate;
uint16_t *dstate;