diff mbox

[v2,44/47] trace: switch qapi/ directory to modular trace.h file

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

Commit Message

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

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

Patch

diff --git a/Makefile.objs b/Makefile.objs
index abdc0a8..e8cbaa2 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -162,7 +162,7 @@  trace-events-subdirs += target/s390x
 trace-events-subdirs += target/ppc
 trace-events-subdirs += qom
 trace-events-subdirs += linux-user
-trace-events-y += qapi/trace-events
+trace-events-subdirs += qapi
 
 trace-events-files = $(trace-events-y) $(trace-events-subdirs:%=%/trace-events)
 
diff --git a/qapi/Makefile.objs b/qapi/Makefile.objs
index 33906ff..3c85604 100644
--- a/qapi/Makefile.objs
+++ b/qapi/Makefile.objs
@@ -4,3 +4,5 @@  util-obj-y += string-input-visitor.o string-output-visitor.o
 util-obj-y += opts-visitor.o qapi-clone-visitor.o
 util-obj-y += qmp-event.o
 util-obj-y += qapi-util.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 63bd97b..052d4e1 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -19,7 +19,7 @@ 
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qapi/visitor-impl.h"
-#include "trace.h"
+#include "qapi/trace.h"
 
 void visit_complete(Visitor *v, void *opaque)
 {