@@ -148,7 +148,7 @@ trace-events-subdirs += hw/9pfs
trace-events-subdirs += hw/ppc
trace-events-subdirs += hw/pci
trace-events-subdirs += hw/s390x
-trace-events-y += hw/vfio/trace-events
+trace-events-subdirs += hw/vfio
trace-events-y += hw/acpi/trace-events
trace-events-y += hw/arm/trace-events
trace-events-y += hw/alpha/trace-events
@@ -5,4 +5,6 @@ obj-$(CONFIG_SOFTMMU) += platform.o
obj-$(CONFIG_SOFTMMU) += calxeda-xgmac.o
obj-$(CONFIG_SOFTMMU) += amd-xgbe.o
obj-$(CONFIG_SOFTMMU) += spapr.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
endif
@@ -33,7 +33,7 @@
#include "qemu/error-report.h"
#include "qemu/range.h"
#include "sysemu/kvm.h"
-#include "trace.h"
+#include "hw/vfio/trace.h"
struct vfio_group_head vfio_group_list =
QLIST_HEAD_INITIALIZER(vfio_group_list);
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "hw/nvram/fw_cfg.h"
#include "pci.h"
-#include "trace.h"
+#include "hw/vfio/trace.h"
/* Use uin32_t for vendor & device so PCI_ANY_ID expands and cannot match hw */
static bool vfio_pci_is(VFIOPCIDevice *vdev, uint32_t vendor, uint32_t device)
@@ -30,7 +30,7 @@
#include "sysemu/kvm.h"
#include "sysemu/sysemu.h"
#include "pci.h"
-#include "trace.h"
+#include "hw/vfio/trace.h"
#include "qapi/error.h"
#define MSIX_CAP_LENGTH 12
@@ -26,7 +26,7 @@
#include "exec/memory.h"
#include "qemu/queue.h"
#include "hw/sysbus.h"
-#include "trace.h"
+#include "hw/vfio/trace.h"
#include "hw/platform-bus.h"
#include "sysemu/kvm.h"
@@ -16,7 +16,7 @@
#include "hw/vfio/vfio-common.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
-#include "trace.h"
+#include "hw/vfio/trace.h"
static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *section)
{
Switch files in the hw/vfio/ directory to include the hw/vfio/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- hw/vfio/Makefile.objs | 2 ++ hw/vfio/common.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 2 +- hw/vfio/platform.c | 2 +- hw/vfio/spapr.c | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-)