[Qemu-devel] [PATCH for-2.8 v1 56/60] trace: switch target-ppc/ directory to modular trace.h file

[Daniel P. Berrange]

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 <address@hidden>
---
 Makefile.objs            | 2 +-
 target-ppc/Makefile.objs | 2 ++
 target-ppc/kvm.c         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index 5734475..9ba93dd 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -158,7 +158,7 @@ trace-events-subdirs += net
 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
 
diff --git a/target-ppc/Makefile.objs b/target-ppc/Makefile.objs
index e667e69..7a71b38 100644
--- a/target-ppc/Makefile.objs
+++ b/target-ppc/Makefile.objs
@@ -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
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 84764ed..7d55145 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -38,7 +38,7 @@
 #include "hw/ppc/spapr_vio.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"
-- 
2.7.4