[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/47] trace: switch util/ directory to modular t
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v2 03/47] trace: switch util/ directory to modular trace.h file |
Date: |
Fri, 6 Jan 2017 15:54:59 +0000 |
Switch files in the util/ directory to include the
util/trace.h file instead of the global trace.h
file.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
Makefile.objs | 2 +-
util/Makefile.objs | 2 ++
util/buffer.c | 2 +-
util/hbitmap.c | 2 +-
util/oslib-posix.c | 2 +-
util/oslib-win32.c | 2 +-
util/qemu-coroutine-lock.c | 2 +-
util/qemu-coroutine.c | 2 +-
8 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index c3f1e45..e8f060e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -120,7 +120,7 @@ ivshmem-server-obj-y = contrib/ivshmem-server/
######################################################################
trace-events-subdirs =
trace-events-y = trace-events
-trace-events-y += util/trace-events
+trace-events-subdirs += util
trace-events-y += crypto/trace-events
trace-events-subdirs += io
trace-events-y += migration/trace-events
diff --git a/util/Makefile.objs b/util/Makefile.objs
index ad0f9c7..d196876 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -36,3 +36,5 @@ util-obj-y += log.o
util-obj-y += qdist.o
util-obj-y += qht.o
util-obj-y += range.o
+trace-obj-y += trace.o
+trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o
diff --git a/util/buffer.c b/util/buffer.c
index d8bb874..f59aef9 100644
--- a/util/buffer.c
+++ b/util/buffer.c
@@ -21,7 +21,7 @@
#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "qemu/buffer.h"
-#include "trace.h"
+#include "util/trace.h"
#define BUFFER_MIN_INIT_SIZE 4096
#define BUFFER_MIN_SHRINK_SIZE 65536
diff --git a/util/hbitmap.c b/util/hbitmap.c
index 9f691b7..32bb356 100644
--- a/util/hbitmap.c
+++ b/util/hbitmap.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/hbitmap.h"
#include "qemu/host-utils.h"
-#include "trace.h"
+#include "util/trace.h"
/* HBitmaps provides an array of bits. The bits are stored as usual in an
* array of unsigned longs, but HBitmap is also optimized to provide fast
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index f631464..155309e 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -32,7 +32,7 @@
#include <glib/gprintf.h>
#include "sysemu/sysemu.h"
-#include "trace.h"
+#include "util/trace.h"
#include "qapi/error.h"
#include "qemu/sockets.h"
#include <libgen.h>
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index d09863c..6ae1681 100644
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -34,7 +34,7 @@
#include "qapi/error.h"
#include "sysemu/sysemu.h"
#include "qemu/main-loop.h"
-#include "trace.h"
+#include "util/trace.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c
index 14cf9ce..9e24b66 100644
--- a/util/qemu-coroutine-lock.c
+++ b/util/qemu-coroutine-lock.c
@@ -27,7 +27,7 @@
#include "qemu/coroutine.h"
#include "qemu/coroutine_int.h"
#include "qemu/queue.h"
-#include "trace.h"
+#include "util/trace.h"
void qemu_co_queue_init(CoQueue *queue)
{
diff --git a/util/qemu-coroutine.c b/util/qemu-coroutine.c
index 737bffa..8f67487 100644
--- a/util/qemu-coroutine.c
+++ b/util/qemu-coroutine.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "trace.h"
+#include "util/trace.h"
#include "qemu-common.h"
#include "qemu/thread.h"
#include "qemu/atomic.h"
--
2.9.3
- Re: [Qemu-devel] [PATCH v2 02/47] trace: switch io/ directory to modular trace.h file, (continued)
- [Qemu-devel] [PATCH v2 04/47] trace: switch crypto/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 03/47] trace: switch util/ directory to modular trace.h file,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v2 05/47] trace: switch migration/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 06/47] trace: switch block/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 07/47] trace: switch hw/block/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 08/47] trace: switch hw/char/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 09/47] trace: switch hw/intc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 10/47] trace: switch hw/net/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 11/47] trace: switch hw/virtio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 12/47] trace: switch hw/audio/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 13/47] trace: switch hw/misc/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06
- [Qemu-devel] [PATCH v2 16/47] trace: switch hw/nvram/ directory to modular trace.h file, Daniel P. Berrange, 2017/01/06