[Qemu-devel] [PATCH v2 38/47] trace: switch target/i386/ directory to modular trace.h file

["Daniel P. Berrange" <berrange@redhat.com>]

Switch files in the target/i386/ directory to include the
target/i386/trace.h file instead of the global trace.h
file.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile.objs             | 2 +-
 target/i386/Makefile.objs | 2 ++
 target/i386/kvm.c         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index dda2c04..a1161be 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -156,7 +156,7 @@ trace-events-subdirs += ui
 trace-events-subdirs += audio
 trace-events-subdirs += net
 trace-events-subdirs += target/arm
-trace-events-y += target/i386/trace-events
+trace-events-subdirs += target/i386
 trace-events-y += target/sparc/trace-events
 trace-events-y += target/s390x/trace-events
 trace-events-y += target/ppc/trace-events
diff --git a/target/i386/Makefile.objs b/target/i386/Makefile.objs
index b223d79..a73e6f3 100644
--- a/target/i386/Makefile.objs
+++ b/target/i386/Makefile.objs
@@ -5,3 +5,5 @@ obj-y += gdbstub.o
 obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o monitor.o
 obj-$(CONFIG_KVM) += kvm.o hyperv.o
 obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 10a9cd8..87f4eae 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -44,7 +44,7 @@
 #include "hw/pci/msi.h"
 #include "migration/migration.h"
 #include "exec/memattrs.h"
-#include "trace.h"
+#include "target/i386/trace.h"
 
 //#define DEBUG_KVM
 
-- 
2.9.3