From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92H-0007bq-8X for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX92E-00060n-I2 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX92E-00060Z-C7 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:42 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B0931C04D2EF for ; Tue, 9 Aug 2016 15:33:41 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:25 +0100 Message-Id: <1470756748-18933-58-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 57/60] trace: switch qom/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" Switch files in the qom/ directory to include the qom/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- qom/Makefile.objs | 2 ++ qom/object.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9ba93dd..53a26fb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -159,7 +159,7 @@ trace-events-subdirs += target-i386 trace-events-subdirs += target-sparc trace-events-subdirs += target-s390x trace-events-subdirs += target-ppc -trace-events-y += qom/trace-events +trace-events-subdirs += qom trace-events-y += linux-user/trace-events trace-events-files = trace-events $(trace-events-subdirs:%=%/trace-events) diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 516349e..8cc7800 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,4 +1,6 @@ qom-obj-y = object.o container.o qom-qobject.o qom-obj-y += object_interfaces.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o common-obj-y = cpu.o diff --git a/qom/object.c b/qom/object.c index 8166b7d..553f385 100644 --- a/qom/object.c +++ b/qom/object.c @@ -20,7 +20,7 @@ #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" #include "qapi/qmp/qerror.h" -#include "trace.h" +#include "qom/trace.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ -- 2.7.4