Switch files in the qom/ directory to include the qom/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- qom/Makefile.objs | 2 ++ qom/object.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 9ba93dd..53a26fb 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -159,7 +159,7 @@ trace-events-subdirs += target-i386 trace-events-subdirs += target-sparc trace-events-subdirs += target-s390x trace-events-subdirs += target-ppc -trace-events-y += qom/trace-events +trace-events-subdirs += qom trace-events-y += linux-user/trace-events trace-events-files = trace-events $(trace-events-subdirs:%=%/trace-events) diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 516349e..8cc7800 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,4 +1,6 @@ qom-obj-y = object.o container.o qom-qobject.o qom-obj-y += object_interfaces.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o common-obj-y = cpu.o diff --git a/qom/object.c b/qom/object.c index 8166b7d..553f385 100644 --- a/qom/object.c +++ b/qom/object.c @@ -20,7 +20,7 @@ #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" #include "qapi/qmp/qerror.h" -#include "trace.h" +#include "qom/trace.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ -- 2.7.4
