[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.8 v1 18/60] trace: switch io/ directory to mod
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH for-2.8 v1 18/60] trace: switch io/ directory to modular trace.h file |
Date: |
Tue, 9 Aug 2016 16:31:46 +0100 |
Switch files in the io/ directory to include the
io/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 2 +-
io/Makefile.objs | 2 ++
io/channel-buffer.c | 2 +-
io/channel-command.c | 2 +-
io/channel-file.c | 2 +-
io/channel-socket.c | 2 +-
io/channel-tls.c | 2 +-
io/channel-websock.c | 2 +-
io/task.c | 2 +-
9 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index ede6dd3..9243d5b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -122,7 +122,7 @@ trace-events-subdirs =
trace-events-y = trace-events
trace-events-y += util/trace-events
trace-events-y += crypto/trace-events
-trace-events-y += io/trace-events
+trace-events-subdirs += io
trace-events-y += migration/trace-events
trace-events-y += block/trace-events
trace-events-y += hw/block/trace-events
diff --git a/io/Makefile.objs b/io/Makefile.objs
index 9d8337d..94cb74e 100644
--- a/io/Makefile.objs
+++ b/io/Makefile.objs
@@ -8,3 +8,5 @@ io-obj-y += channel-watch.o
io-obj-y += channel-websock.o
io-obj-y += channel-util.o
io-obj-y += task.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/io/channel-buffer.c b/io/channel-buffer.c
index 43d7959..b4e50d6 100644
--- a/io/channel-buffer.c
+++ b/io/channel-buffer.c
@@ -22,7 +22,7 @@
#include "io/channel-buffer.h"
#include "io/channel-watch.h"
#include "qemu/sockets.h"
-#include "trace.h"
+#include "io/trace.h"
QIOChannelBuffer *
qio_channel_buffer_new(size_t capacity)
diff --git a/io/channel-command.c b/io/channel-command.c
index ad25313..7624653 100644
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -23,7 +23,7 @@
#include "io/channel-watch.h"
#include "qapi/error.h"
#include "qemu/sockets.h"
-#include "trace.h"
+#include "io/trace.h"
QIOChannelCommand *
diff --git a/io/channel-file.c b/io/channel-file.c
index e1da243..7b064ef 100644
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -23,7 +23,7 @@
#include "io/channel-watch.h"
#include "qapi/error.h"
#include "qemu/sockets.h"
-#include "trace.h"
+#include "io/trace.h"
QIOChannelFile *
qio_channel_file_new_fd(int fd)
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 196a4f1..a31964a 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -22,7 +22,7 @@
#include "qapi/error.h"
#include "io/channel-socket.h"
#include "io/channel-watch.h"
-#include "trace.h"
+#include "io/trace.h"
#include "qapi/clone-visitor.h"
#define SOCKET_MAX_FDS 16
diff --git a/io/channel-tls.c b/io/channel-tls.c
index 9a8525c..a2473f4 100644
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -21,7 +21,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "io/channel-tls.h"
-#include "trace.h"
+#include "io/trace.h"
static ssize_t qio_channel_tls_write_handler(const char *buf,
diff --git a/io/channel-websock.c b/io/channel-websock.c
index 533bd4b..24d226b 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -23,7 +23,7 @@
#include "qemu/bswap.h"
#include "io/channel-websock.h"
#include "crypto/hash.h"
-#include "trace.h"
+#include "io/trace.h"
/* Max amount to allow in rawinput/rawoutput buffers */
diff --git a/io/task.c b/io/task.c
index c7f97a9..d81adf2 100644
--- a/io/task.c
+++ b/io/task.c
@@ -22,7 +22,7 @@
#include "io/task.h"
#include "qapi/error.h"
#include "qemu/thread.h"
-#include "trace.h"
+#include "io/trace.h"
struct QIOTask {
Object *source;
--
2.7.4
- [Qemu-devel] [PATCH for-2.8 v1 12/60] trace: use -1 instead of TRACE_VCPU_EVENT_COUNT as magic value, (continued)
- [Qemu-devel] [PATCH for-2.8 v1 12/60] trace: use -1 instead of TRACE_VCPU_EVENT_COUNT as magic value, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 14/60] trace: get rid of generated-events.h/generated-events.c, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 13/60] trace: remove generated-events.h from many includes, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 19/60] trace: switch util/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 15/60] trace: introduce a formal group name for trace events, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 17/60] trace: introduce some Makefile rules for module code gen, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 20/60] trace: switch crypto/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 16/60] trace: introduce ID range offsets per trace-events file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 22/60] trace: switch block/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 24/60] trace: switch hw/char/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 18/60] trace: switch io/ directory to modular trace.h file,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH for-2.8 v1 26/60] trace: switch hw/net/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 25/60] trace: switch hw/intc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 28/60] trace: switch hw/audio/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 30/60] trace: switch hw/usb/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 21/60] trace: switch migration/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 27/60] trace: switch hw/virtio/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 32/60] trace: switch hw/nvram/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 23/60] trace: switch hw/block/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 29/60] trace: switch hw/misc/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09
- [Qemu-devel] [PATCH for-2.8 v1 34/60] trace: switch hw/input/ directory to modular trace.h file, Daniel P. Berrange, 2016/08/09