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 <berra...@redhat.com> --- 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 cea70ce..86c62cd 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 489e63b..abdc809 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 5ac89fe..68e1c0f 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" #include "sysemu/numa.h" #define ACPI_CPU_HOTPLUG_REG_LEN 12 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.9.3
