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 <berra...@redhat.com> --- 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 86c62cd..6a0c033 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 4c5c4ee..0704312 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) += aspeed_soc.o aspeed.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 7102686..915f88d 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.9.3
