Switch files in the target/sparc/ directory to include the target/sparc/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <[email protected]> --- Makefile.objs | 2 +- target/sparc/Makefile.objs | 2 ++ target/sparc/int32_helper.c | 2 +- target/sparc/int64_helper.c | 2 +- target/sparc/mmu_helper.c | 2 +- target/sparc/win_helper.c | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index a1161be..cc8f506 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -157,7 +157,7 @@ trace-events-subdirs += audio trace-events-subdirs += net trace-events-subdirs += target/arm trace-events-subdirs += target/i386 -trace-events-y += target/sparc/trace-events +trace-events-subdirs += target/sparc trace-events-y += target/s390x/trace-events trace-events-y += target/ppc/trace-events trace-events-y += qom/trace-events diff --git a/target/sparc/Makefile.objs b/target/sparc/Makefile.objs index ec90569..0ca6e73 100644 --- a/target/sparc/Makefile.objs +++ b/target/sparc/Makefile.objs @@ -5,3 +5,5 @@ obj-$(TARGET_SPARC) += int32_helper.o obj-$(TARGET_SPARC64) += int64_helper.o obj-$(TARGET_SPARC64) += vis_helper.o obj-y += gdbstub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c index 09afe13..2838eda 100644 --- a/target/sparc/int32_helper.c +++ b/target/sparc/int32_helper.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "trace.h" +#include "target/sparc/trace.h" #include "sysemu/sysemu.h" #include "exec/log.h" diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c index 29360fa..ad0a16c 100644 --- a/target/sparc/int64_helper.c +++ b/target/sparc/int64_helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "exec/log.h" -#include "trace.h" +#include "target/sparc/trace.h" #define DEBUG_PCALL diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index 044e88c..6f66c4a 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" -#include "trace.h" +#include "target/sparc/trace.h" #include "exec/address-spaces.h" /* Sparc MMU emulation */ diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c index 2d5b546..3b6dd33 100644 --- a/target/sparc/win_helper.c +++ b/target/sparc/win_helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" -#include "trace.h" +#include "target/sparc/trace.h" static inline void memcpy32(target_ulong *dst, const target_ulong *src) { -- 2.9.3
