Switch files in the hw/sparc/ directory to include the hw/sparc/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- hw/sparc/Makefile.objs | 2 ++ hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 2d56890..6c7252f 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -139,7 +139,7 @@ trace-events-subdirs += hw/display trace-events-subdirs += hw/input trace-events-subdirs += hw/timer trace-events-subdirs += hw/dma -trace-events-y += hw/sparc/trace-events +trace-events-subdirs += hw/sparc trace-events-y += hw/sd/trace-events trace-events-y += hw/isa/trace-events trace-events-y += hw/mem/trace-events diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index c987b5b..f509dc7 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1 +1,3 @@ obj-y += sun4m.o leon3.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 6e16478..2cc29d4 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -34,7 +34,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "elf.h" -#include "trace.h" +#include "hw/sparc/trace.h" #include "exec/address-spaces.h" #include "hw/sparc/grlib.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f5b6efd..5b0c31e 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -46,7 +46,7 @@ #include "hw/loader.h" #include "elf.h" #include "sysemu/block-backend.h" -#include "trace.h" +#include "hw/sparc/trace.h" #include "qemu/cutils.h" /* -- 2.9.3
