From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91e-0006eG-0v for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91X-0005kc-RW for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91X-0005kE-Ji for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:32:59 -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 D36FC636FC for ; Tue, 9 Aug 2016 15:32:55 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:31:46 +0100 Message-Id: <1470756748-18933-19-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 18/60] trace: switch io/ 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 io/ directory to include the io/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- 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