Switch files in the hw/isa/ directory to include the hw/isa/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- hw/isa/Makefile.objs | 2 ++ hw/isa/pc87312.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1d9cdd0..a901f5d 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -141,7 +141,7 @@ trace-events-subdirs += hw/timer trace-events-subdirs += hw/dma trace-events-subdirs += hw/sparc trace-events-subdirs += hw/sd -trace-events-y += hw/isa/trace-events +trace-events-subdirs += hw/isa trace-events-y += hw/mem/trace-events trace-events-y += hw/i386/trace-events trace-events-y += hw/9pfs/trace-events diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index 9164556..a273afd 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -6,3 +6,5 @@ common-obj-$(CONFIG_PIIX4) += piix4.o common-obj-$(CONFIG_VT82C686) += vt82c686.o obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index b1c1a0a..d1d13f3 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -31,7 +31,7 @@ #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/char.h" -#include "trace.h" +#include "hw/isa/trace.h" #define REG_FER 0 -- 2.9.3
