From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX927-0007VJ-EG for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX922-0005xF-AJ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55178) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX922-0005x9-4a for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:30 -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 B949F3BEC1 for ; Tue, 9 Aug 2016 15:33:29 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:15 +0100 Message-Id: <1470756748-18933-48-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 47/60] trace: switch hw/acpi/ 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/acpi/ directory to include the hw/acpi/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/acpi/Makefile.objs | 2 ++ hw/acpi/cpu.c | 2 +- hw/acpi/memory_hotplug.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 19645ec..1cbd038 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -149,7 +149,7 @@ trace-events-subdirs += hw/ppc trace-events-subdirs += hw/pci trace-events-subdirs += hw/s390x trace-events-subdirs += hw/vfio -trace-events-y += hw/acpi/trace-events +trace-events-subdirs += hw/acpi trace-events-y += hw/arm/trace-events trace-events-y += hw/alpha/trace-events trace-events-y += ui/trace-events diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 4b7da66..d2744a4 100644 --- a/hw/acpi/Makefile.objs +++ b/hw/acpi/Makefile.objs @@ -8,3 +8,5 @@ common-obj-$(CONFIG_ACPI) += acpi_interface.o common-obj-$(CONFIG_ACPI) += bios-linker-loader.o common-obj-$(CONFIG_ACPI) += aml-build.o common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index c13b65c..a33efaf 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -3,7 +3,7 @@ #include "hw/acpi/cpu.h" #include "qapi/error.h" #include "qapi-event.h" -#include "trace.h" +#include "hw/acpi/trace.h" #define ACPI_CPU_HOTPLUG_REG_LEN 12 #define ACPI_CPU_SELECTOR_OFFSET_WR 0 diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index ec4e64b..e442970 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -4,7 +4,7 @@ #include "hw/mem/pc-dimm.h" #include "hw/boards.h" #include "hw/qdev-core.h" -#include "trace.h" +#include "hw/acpi/trace.h" #include "qapi-event.h" static ACPIOSTInfo *acpi_memory_device_status(int slot, MemStatus *mdev) -- 2.7.4