@@ -154,7 +154,7 @@ trace-events-subdirs += hw/arm
trace-events-subdirs += hw/alpha
trace-events-subdirs += ui
trace-events-subdirs += audio
-trace-events-y += net/trace-events
+trace-events-subdirs += net
trace-events-y += target/arm/trace-events
trace-events-y += target/i386/trace-events
trace-events-y += target/sparc/trace-events
@@ -20,3 +20,5 @@ common-obj-y += colo-compare.o
common-obj-y += colo.o
common-obj-y += filter-rewriter.o
common-obj-y += filter-replay.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
@@ -19,7 +19,7 @@
#include "qom/object.h"
#include "qemu/main-loop.h"
#include "qemu/error-report.h"
-#include "trace.h"
+#include "net/trace.h"
#include "sysemu/char.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
@@ -16,7 +16,7 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qmp-commands.h"
-#include "trace.h"
+#include "net/trace.h"
typedef struct VhostUserState {
NetClientState nc;
Switch files in the net/ directory to include the net/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- Makefile.objs | 2 +- net/Makefile.objs | 2 ++ net/filter-mirror.c | 2 +- net/vhost-user.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)