From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX929-0007Xq-Ob for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX928-0005z1-3Q for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43632) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX927-0005yl-U9 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:36 -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 889F3201E9 for ; Tue, 9 Aug 2016 15:33:35 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:20 +0100 Message-Id: <1470756748-18933-53-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 52/60] trace: switch net/ 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 net/ directory to include the net/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- 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 bcd830e..2f892ed 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-i386/trace-events trace-events-y += target-sparc/trace-events trace-events-y += target-s390x/trace-events diff --git a/net/Makefile.objs b/net/Makefile.objs index b7c22fd..4939b48 100644 --- a/net/Makefile.objs +++ b/net/Makefile.objs @@ -16,3 +16,5 @@ common-obj-$(CONFIG_NETMAP) += netmap.o common-obj-y += filter.o common-obj-y += filter-buffer.o common-obj-y += filter-mirror.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 35df374..a0d1eca 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 b0595f8..b2b53ca 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.7.4