From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX925-0007TZ-K7 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX923-0005xZ-E9 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX923-0005xR-8S for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:31 -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 D717181129 for ; Tue, 9 Aug 2016 15:33:30 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:16 +0100 Message-Id: <1470756748-18933-49-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 48/60] trace: switch hw/arm/ 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/arm/ directory to include the hw/arm/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/arm/Makefile.objs | 2 ++ hw/arm/virt-acpi-build.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1cbd038..fbcf040 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -150,7 +150,7 @@ trace-events-subdirs += hw/pci trace-events-subdirs += hw/s390x trace-events-subdirs += hw/vfio trace-events-subdirs += hw/acpi -trace-events-y += hw/arm/trace-events +trace-events-subdirs += hw/arm trace-events-y += hw/alpha/trace-events trace-events-y += ui/trace-events trace-events-y += audio/trace-events diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 12764ef..ac9fa9a 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -18,3 +18,5 @@ obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o obj-$(CONFIG_ASPEED_SOC) += ast2400.o palmetto-bmc.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 28fc59c..775be61 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -31,7 +31,7 @@ #include "qemu-common.h" #include "hw/arm/virt-acpi-build.h" #include "qemu/bitmap.h" -#include "trace.h" +#include "hw/arm/trace.h" #include "qom/cpu.h" #include "target-arm/cpu.h" #include "hw/acpi/acpi-defs.h" -- 2.7.4