[Qemu-devel] [PATCH v2 36/47] trace: switch net/ directory to modular trace.h file

[Daniel P. Berrange]

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 <address@hidden>
---
 Makefile.objs       | 2 +-
 net/Makefile.objs   | 2 ++
 net/filter-mirror.c | 2 +-
 net/vhost-user.c    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index dc3a51e..d6125a8 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -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
diff --git a/net/Makefile.objs b/net/Makefile.objs
index 2e2fd43..9cb8f78 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -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
diff --git a/net/filter-mirror.c b/net/filter-mirror.c
index b7d6456..5e1cb16 100644
--- a/net/filter-mirror.c
+++ b/net/filter-mirror.c
@@ -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"
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 7aff77e..c812462 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -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;
-- 
2.9.3