diff mbox

[for-2.8,v1,58/60] trace: switch linux-user/ directory to modular trace.h file

Message ID 1470756748-18933-59-git-send-email-berrange@redhat.com
State New
Headers show

Commit Message

Daniel P. Berrangé Aug. 9, 2016, 3:32 p.m. UTC 
Switch files in the linux-user/ directory to include the
linux-user/trace.h file instead of the global trace.h
file.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 Makefile.objs            | 2 +-
 linux-user/Makefile.objs | 2 ++
 linux-user/signal.c      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 53a26fb..c2ee78e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -160,7 +160,7 @@  trace-events-subdirs += target-sparc
 trace-events-subdirs += target-s390x
 trace-events-subdirs += target-ppc
 trace-events-subdirs += qom
-trace-events-y += linux-user/trace-events
+trace-events-subdirs += linux-user
 
 trace-events-files = trace-events $(trace-events-subdirs:%=%/trace-events)
 
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
index 8c93058..7a05775 100644
--- a/linux-user/Makefile.objs
+++ b/linux-user/Makefile.objs
@@ -6,3 +6,5 @@  obj-$(TARGET_HAS_BFLT) += flatload.o
 obj-$(TARGET_I386) += vm86.o
 obj-$(TARGET_ARM) += arm/nwfpe/
 obj-$(TARGET_M68K) += m68k-sim.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 9a4d894..3db2faa 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -24,7 +24,7 @@ 
 #include "qemu.h"
 #include "qemu-common.h"
 #include "target_signal.h"
-#include "trace.h"
+#include "linux-user/trace.h"
 
 static struct target_sigaltstack target_sigaltstack_used = {
     .ss_sp = 0,