Commit a82417b5 authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Stefan Hajnoczi
Browse files

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: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarLluís Vilanova <vilanova@ac.upc.edu>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-id: 1475588159-30598-9-git-send-email-berrange@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 99672c71

trace/event-internal.h

+2 −5
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ 
#ifndef TRACE__EVENT_INTERNAL_H

#define TRACE__EVENT_INTERNAL_H



#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;