Switch files in the ui/ directory to include the ui/trace.h file instead of the global trace.h file.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- Makefile.objs | 2 +- ui/Makefile.objs | 3 +++ ui/console.c | 2 +- ui/gtk-egl.c | 2 +- ui/gtk-gl-area.c | 2 +- ui/gtk.c | 2 +- ui/input.c | 2 +- ui/spice-display.c | 2 +- ui/vnc.c | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 510083c..b81db74 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -152,7 +152,7 @@ trace-events-subdirs += hw/vfio trace-events-subdirs += hw/acpi trace-events-subdirs += hw/arm trace-events-subdirs += hw/alpha -trace-events-y += ui/trace-events +trace-events-subdirs += ui trace-events-y += audio/trace-events trace-events-y += net/trace-events trace-events-y += target-i386/trace-events diff --git a/ui/Makefile.objs b/ui/Makefile.objs index dc936f1..c9d1847 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -51,3 +51,6 @@ gtk-egl.o-libs += $(OPENGL_LIBS) shader.o-libs += $(OPENGL_LIBS) console-gl.o-libs += $(OPENGL_LIBS) egl-helpers.o-libs += $(OPENGL_LIBS) + +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/ui/console.c b/ui/console.c index c24bfe4..8adfff7 100644 --- a/ui/console.c +++ b/ui/console.c @@ -28,7 +28,7 @@ #include "qemu/timer.h" #include "qmp-commands.h" #include "sysemu/char.h" -#include "trace.h" +#include "ui/trace.h" #include "exec/memory.h" #define DEFAULT_BACKSCROLL 512 diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c index 3f5d328..1c12d34 100644 --- a/ui/gtk-egl.c +++ b/ui/gtk-egl.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "trace.h" +#include "ui/trace.h" #include "ui/console.h" #include "ui/gtk.h" diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index 0df5a36..49c9e00 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include "trace.h" +#include "ui/trace.h" #include "ui/console.h" #include "ui/gtk.h" diff --git a/ui/gtk.c b/ui/gtk.c index 58d20ee..58c66be 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -48,7 +48,7 @@ #endif #include <math.h> -#include "trace.h" +#include "ui/trace.h" #include "ui/input.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" diff --git a/ui/input.c b/ui/input.c index ed88cda..b3b881b 100644 --- a/ui/input.c +++ b/ui/input.c @@ -4,7 +4,7 @@ #include "qapi-types.h" #include "qemu/error-report.h" #include "qmp-commands.h" -#include "trace.h" +#include "ui/trace.h" #include "ui/input.h" #include "ui/console.h" #include "sysemu/replay.h" diff --git a/ui/spice-display.c b/ui/spice-display.c index 99132b6..9065e74 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -22,7 +22,7 @@ #include "qemu/queue.h" #include "ui/console.h" #include "sysemu/sysemu.h" -#include "trace.h" +#include "ui/trace.h" #include "ui/spice-display.h" diff --git a/ui/vnc.c b/ui/vnc.c index 853b57e..564c80e 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "vnc.h" #include "vnc-jobs.h" -#include "trace.h" +#include "ui/trace.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" -- 2.7.4
