@@ -138,7 +138,7 @@ trace-events-subdirs += hw/nvram
trace-events-subdirs += hw/display
trace-events-subdirs += hw/input
trace-events-subdirs += hw/timer
-trace-events-y += hw/dma/trace-events
+trace-events-subdirs += hw/dma
trace-events-y += hw/sparc/trace-events
trace-events-y += hw/sd/trace-events
trace-events-y += hw/isa/trace-events
@@ -14,3 +14,5 @@ obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
obj-$(CONFIG_RASPI) += bcm2835_dma.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -26,7 +26,7 @@
#include "hw/isa/isa.h"
#include "hw/isa/i8257.h"
#include "qemu/main-loop.h"
-#include "trace.h"
+#include "hw/dma/trace.h"
#define I8257(obj) \
OBJECT_CHECK(I8257State, (obj), TYPE_I8257)
@@ -29,7 +29,7 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "exec/address-spaces.h"
-#include "trace.h"
+#include "hw/dma/trace.h"
/********************************************************/
/* rc4030 emulation */
@@ -30,7 +30,7 @@
#include "hw/sparc/sparc32_dma.h"
#include "hw/sparc/sun4m.h"
#include "hw/sysbus.h"
-#include "trace.h"
+#include "hw/dma/trace.h"
/*
* This is the DMA controller part of chip STP2000 (Master I/O), also
@@ -26,7 +26,7 @@
#include "hw/sparc/sun4m.h"
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
-#include "trace.h"
+#include "hw/dma/trace.h"
/*
* I/O MMU used by Sun4m systems
Switch files in the hw/dma/ directory to include the hw/dma/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- hw/dma/Makefile.objs | 2 ++ hw/dma/i8257.c | 2 +- hw/dma/rc4030.c | 2 +- hw/dma/sparc32_dma.c | 2 +- hw/dma/sun4m_iommu.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-)