From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91x-0007Le-Kj for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX91w-0005vI-N2 for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33064) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX91w-0005v4-HT for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:24 -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 28E4C7AE8E for ; Tue, 9 Aug 2016 15:33:24 +0000 (UTC) From: "Daniel P. Berrange" Date: Tue, 9 Aug 2016 16:32:10 +0100 Message-Id: <1470756748-18933-43-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 42/60] trace: switch hw/9pfs/ 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 hw/9pfs/ directory to include the hw/9pfs/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/9pfs/9p.c | 2 +- hw/9pfs/Makefile.objs | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 1dc55aa..4734bac 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -144,7 +144,7 @@ trace-events-subdirs += hw/sd trace-events-subdirs += hw/isa trace-events-subdirs += hw/mem trace-events-subdirs += hw/i386 -trace-events-y += hw/9pfs/trace-events +trace-events-subdirs += hw/9pfs trace-events-y += hw/ppc/trace-events trace-events-y += hw/pci/trace-events trace-events-y += hw/s390x/trace-events diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index b6b02b4..2531c82 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -21,7 +21,7 @@ #include "fsdev/qemu-fsdev.h" #include "9p-xattr.h" #include "coth.h" -#include "trace.h" +#include "hw/9pfs/trace.h" #include "migration/migration.h" int open_fd_hw; diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index da0ae0c..28eb2e5 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -7,3 +7,5 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o common-obj-y += 9p-proxy.o obj-y += virtio-9p-device.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o -- 2.7.4