Switch files in the hw/audio/ directory to include the hw/audio/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- hw/audio/Makefile.objs | 3 +++ hw/audio/cs4231.c | 2 +- hw/audio/milkymist-ac97.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index f5ecfbf..41ab795 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -130,7 +130,7 @@ trace-events-subdirs += hw/char trace-events-subdirs += hw/intc trace-events-subdirs += hw/net trace-events-subdirs += hw/virtio -trace-events-y += hw/audio/trace-events +trace-events-subdirs += hw/audio trace-events-y += hw/misc/trace-events trace-events-y += hw/usb/trace-events trace-events-y += hw/scsi/trace-events diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs index 7ce85a2..d779550 100644 --- a/hw/audio/Makefile.objs +++ b/hw/audio/Makefile.objs @@ -16,3 +16,6 @@ common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o $(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 + +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 30690f9..8c7eb1e 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/audio/trace.h" /* * In addition to Crystal CS4231 there is a DMA controller on Sparc. diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index bc8db71..fd994b4 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/audio/trace.h" #include "audio/audio.h" #include "qemu/error-report.h" -- 2.9.3
