From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91X-0006Yo-Es for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91V-0005jb-OZ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91V-0005jU-Fs for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:57 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E670793DD for ; Tue, 9 Aug 2016 15:32:57 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:47 +0100 Message-Id: <1470756748-18933-20-git-send-email-berrange@redhat.com> In-Reply-To: <1470756748-18933-1-git-send-email-berrange@redhat.com> References: <1470756748-18933-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH for-2.8 v1 19/60] trace: switch util/ directory to modular trace.h file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P. Berrange" 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 --- 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 9243d5b..53b2785 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 96cb1e0..824e769 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -35,3 +35,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 99fd2ba..4c94a01 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 f2d4e9e..afde145 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -33,7 +33,7 @@ #include #include "sysemu/sysemu.h" -#include "trace.h" +#include "util/trace.h" #include "qapi/error.h" #include "qemu/sockets.h" #include diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 4c1dcf1..2c539bc 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 22aa9ab..ff5bf99 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 89f21a9..c953db6 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.7.4