From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91w-0007Kr-NI for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91v-0005ux-J8 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91v-0005ut-D8 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:23 -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 083105CD for ; Tue, 9 Aug 2016 15:33:23 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:09 +0100 Message-Id: <1470756748-18933-42-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 41/60] trace: switch hw/i386/ 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 hw/i386/ directory to include the hw/i386/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/i386/Makefile.objs | 2 ++ hw/i386/x86-iommu.c | 2 +- hw/i386/xen/xen_platform.c | 1 + hw/i386/xen/xen_pvdevice.c | 1 + 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index af4fea7..1dc55aa 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -143,7 +143,7 @@ trace-events-subdirs += hw/sparc trace-events-subdirs += hw/sd trace-events-subdirs += hw/isa trace-events-subdirs += hw/mem -trace-events-y += hw/i386/trace-events +trace-events-subdirs += hw/i386 trace-events-y += hw/9pfs/trace-events trace-events-y += hw/ppc/trace-events trace-events-y += hw/pci/trace-events diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 90e94ff..ffbbb6c 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -8,3 +8,5 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o obj-y += pci-assign-load-rom.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c index ce26b2a..af486ce 100644 --- a/hw/i386/x86-iommu.c +++ b/hw/i386/x86-iommu.c @@ -22,7 +22,7 @@ #include "hw/boards.h" #include "hw/i386/x86-iommu.h" #include "qemu/error-report.h" -#include "trace.h" +#include "hw/i386/trace.h" void x86_iommu_iec_register_notifier(X86IOMMUState *iommu, iec_notify_fn fn, void *data) diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index aa78393..88ea922 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -33,6 +33,7 @@ #include "hw/xen/xen_common.h" #include "hw/xen/xen_backend.h" #include "trace.h" +#include "hw/i386/trace.h" #include "exec/address-spaces.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c index c093b34..742a3d9 100644 --- a/hw/i386/xen/xen_pvdevice.c +++ b/hw/i386/xen/xen_pvdevice.c @@ -34,6 +34,7 @@ #include "hw/hw.h" #include "hw/pci/pci.h" #include "trace.h" +#include "hw/i386/trace.h" #define TYPE_XEN_PV_DEVICE "xen-pvdevice" -- 2.7.4