@@ -159,7 +159,7 @@ trace-events-subdirs += target/arm
trace-events-subdirs += target/i386
trace-events-subdirs += target/sparc
trace-events-subdirs += target/s390x
-trace-events-y += target/ppc/trace-events
+trace-events-subdirs += target/ppc
trace-events-y += qom/trace-events
trace-events-y += linux-user/trace-events
trace-events-y += qapi/trace-events
@@ -15,3 +15,5 @@ obj-y += misc_helper.o
obj-y += mem_helper.o
obj-$(CONFIG_USER_ONLY) += user_only_helper.o
obj-y += gdbstub.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -39,7 +39,7 @@
#include "hw/ppc/spapr_cpu_core.h"
#include "hw/ppc/ppc.h"
#include "sysemu/watchdog.h"
-#include "trace.h"
+#include "target/ppc/trace.h"
#include "exec/gdbstub.h"
#include "exec/memattrs.h"
#include "sysemu/hostmem.h"
Switch files in the target/ppc/ directory to include the target/ppc/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- target/ppc/Makefile.objs | 2 ++ target/ppc/kvm.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)