Switch files in the hw/ppc/ directory to include the hw/ppc/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- hw/ppc/Makefile.objs | 3 +++ hw/ppc/ppc.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_hcall.c | 2 +- hw/ppc/spapr_iommu.c | 2 +- hw/ppc/spapr_pci.c | 2 +- hw/ppc/spapr_rtas_ddw.c | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 4734bac..0458667 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -145,7 +145,7 @@ trace-events-subdirs += hw/isa trace-events-subdirs += hw/mem trace-events-subdirs += hw/i386 trace-events-subdirs += hw/9pfs -trace-events-y += hw/ppc/trace-events +trace-events-subdirs += hw/ppc trace-events-y += hw/pci/trace-events trace-events-y += hw/s390x/trace-events trace-events-y += hw/vfio/trace-events diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 91a3420..8cf7759 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -23,3 +23,6 @@ obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-$(CONFIG_XILINX) += virtex_ml507.o + +common-obj-y += trace.o +common-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index e425252..1816fac 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -36,7 +36,7 @@ #include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" -#include "trace.h" +#include "hw/ppc/trace.h" //#define PPC_DEBUG_IRQ //#define PPC_DEBUG_TB diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 054af1e..c5c97b1 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -45,7 +45,7 @@ #include "sysemu/arch_init.h" #include "sysemu/qtest.h" #include "exec/address-spaces.h" -#include "trace.h" +#include "hw/ppc/trace.h" #include "elf.h" #include "qemu/cutils.h" diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 57564e5..4236315 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -61,7 +61,7 @@ #include "hw/usb.h" #include "qemu/config-file.h" #include "qemu/error-report.h" -#include "trace.h" +#include "hw/ppc/trace.h" #include "hw/nmi.h" #include "hw/compat.h" diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 73af112..6d277b6 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -8,7 +8,7 @@ #include "hw/ppc/spapr.h" #include "mmu-hash64.h" #include "cpu-models.h" -#include "trace.h" +#include "hw/ppc/trace.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 6bc4d4d..e8e7900 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -25,7 +25,7 @@ #include "kvm_ppc.h" #include "sysemu/dma.h" #include "exec/address-spaces.h" -#include "trace.h" +#include "hw/ppc/trace.h" #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index 949c44f..598a79c 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -37,7 +37,7 @@ #include "exec/address-spaces.h" #include "exec/ram_addr.h" #include <libfdt.h> -#include "trace.h" +#include "hw/ppc/trace.h" #include "qemu/error-report.h" #include "qapi/qmp/qerror.h" diff --git a/hw/ppc/spapr_rtas_ddw.c b/hw/ppc/spapr_rtas_ddw.c index 177dcff..3dad98c 100644 --- a/hw/ppc/spapr_rtas_ddw.c +++ b/hw/ppc/spapr_rtas_ddw.c @@ -22,7 +22,7 @@ #include "qemu/error-report.h" #include "hw/ppc/spapr.h" #include "hw/pci-host/spapr.h" -#include "trace.h" +#include "hw/ppc/trace.h" static int spapr_phb_get_active_win_num_cb(Object *child, void *opaque) { -- 2.7.4
