Switch files in the hw/pci/ directory to include the hw/pci/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- hw/pci/Makefile.objs | 2 ++ hw/pci/pci.c | 2 +- hw/pci/pci_host.c | 2 +- hw/ppc/Makefile.objs | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 0458667..d63efb2 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -146,7 +146,7 @@ trace-events-subdirs += hw/mem trace-events-subdirs += hw/i386 trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/ppc -trace-events-y += hw/pci/trace-events +trace-events-subdirs += hw/pci trace-events-y += hw/s390x/trace-events trace-events-y += hw/vfio/trace-events trace-events-y += hw/acpi/trace-events diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..b075774 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -7,3 +7,5 @@ common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o common-obj-$(CONFIG_ALL) += pci-stub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 24fae16..8c1c7b9 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -34,7 +34,7 @@ #include "qemu/error-report.h" #include "qemu/range.h" #include "qmp-commands.h" -#include "trace.h" +#include "hw/pci/trace.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "exec/address-spaces.h" diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 5eaa935..2ecf5b9 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -22,7 +22,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" -#include "trace.h" +#include "hw/pci/trace.h" /* debug PCI */ //#define DEBUG_PCI diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 8cf7759..39bc56f 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -24,5 +24,5 @@ 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 +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o -- 2.7.4
