From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blzsv-00075W-JN for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1blzsq-0005sh-3E for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1blzsp-0005sa-Tr for qemu-devel@nongnu.org; Mon, 19 Sep 2016 10:49:24 -0400 From: "Daniel P. Berrange" Date: Mon, 19 Sep 2016 15:48:57 +0100 Message-Id: <1474296549-29171-7-git-send-email-berrange@redhat.com> In-Reply-To: <1474296549-29171-1-git-send-email-berrange@redhat.com> References: <1474296549-29171-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v3 06/18] trace: break circular dependancy in event-internal.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , "Daniel P. Berrange" 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 Signed-off-by: Daniel P. Berrange --- trace/event-internal.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/trace/event-internal.h b/trace/event-internal.h index 3b9ceb5..36906e2 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. @@ -28,8 +25,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; -- 2.7.4