diff mbox

[v2,37/47] trace: switch target/arm/ directory to modular trace.h file

Message ID 20170106155543.12827-38-berrange@redhat.com
State New
Headers show

Commit Message

Daniel P. Berrangé Jan. 6, 2017, 3:55 p.m. UTC 
Switch files in the target/arm/ directory to include the
target/arm/trace.h file instead of the global trace.h
file.

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

Patch

diff --git a/Makefile.objs b/Makefile.objs
index d6125a8..dda2c04 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -155,7 +155,7 @@  trace-events-subdirs += hw/alpha
 trace-events-subdirs += ui
 trace-events-subdirs += audio
 trace-events-subdirs += net
-trace-events-y += target/arm/trace-events
+trace-events-subdirs += target/arm
 trace-events-y += target/i386/trace-events
 trace-events-y += target/sparc/trace-events
 trace-events-y += target/s390x/trace-events
diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs
index 847fb52..a6bbb0e 100644
--- a/target/arm/Makefile.objs
+++ b/target/arm/Makefile.objs
@@ -10,3 +10,5 @@  obj-y += gdbstub.o
 obj-$(TARGET_AARCH64) += cpu64.o translate-a64.o helper-a64.o gdbstub64.o
 obj-y += crypto_helper.o
 obj-$(CONFIG_SOFTMMU) += arm-powerctl.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/target/arm/helper.c b/target/arm/helper.c
index 8dcabbf..4b232e9 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -1,5 +1,5 @@ 
 #include "qemu/osdep.h"
-#include "trace.h"
+#include "target/arm/trace.h"
 #include "cpu.h"
 #include "internals.h"
 #include "exec/gdbstub.h"