From patchwork Tue Aug 9 15:32:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 657370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3s7zmB169Pz9sRB for ; Wed, 10 Aug 2016 02:11:06 +1000 (AEST) Received: from localhost ([::1]:36392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX9cN-0005pa-AV for incoming@patchwork.ozlabs.org; Tue, 09 Aug 2016 12:11:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX924-0007Ri-NN for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bX921-0005wu-CZ for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bX921-0005wq-4O for qemu-devel@nongnu.org; Tue, 09 Aug 2016 11:33:29 -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 A200B68E20 for ; Tue, 9 Aug 2016 15:33:28 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-7-178.ams2.redhat.com [10.36.7.178]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u79FWX36014984; Tue, 9 Aug 2016 11:33:27 -0400 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 9 Aug 2016 16:32:14 +0100 Message-Id: <1470756748-18933-47-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 09 Aug 2016 15:33:28 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.8 v1 46/60] trace: switch hw/vfio/ directory to modular trace.h file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Switch files in the hw/vfio/ directory to include the hw/vfio/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/vfio/Makefile.objs | 2 ++ hw/vfio/common.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 2 +- hw/vfio/platform.c | 2 +- hw/vfio/spapr.c | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 296c824..19645ec 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -148,7 +148,7 @@ trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/ppc trace-events-subdirs += hw/pci trace-events-subdirs += hw/s390x -trace-events-y += hw/vfio/trace-events +trace-events-subdirs += hw/vfio trace-events-y += hw/acpi/trace-events trace-events-y += hw/arm/trace-events trace-events-y += hw/alpha/trace-events diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index c25e32b..33f7d4f 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -5,4 +5,6 @@ obj-$(CONFIG_SOFTMMU) += platform.o obj-$(CONFIG_SOFTMMU) += calxeda-xgmac.o obj-$(CONFIG_SOFTMMU) += amd-xgbe.o obj-$(CONFIG_SOFTMMU) += spapr.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o endif diff --git a/hw/vfio/common.c b/hw/vfio/common.c index b313e7c..5092def 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -33,7 +33,7 @@ #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/kvm.h" -#include "trace.h" +#include "hw/vfio/trace.h" struct vfio_group_head vfio_group_list = QLIST_HEAD_INITIALIZER(vfio_group_list); diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index bec694c..72acb72 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -16,7 +16,7 @@ #include "qapi/error.h" #include "hw/nvram/fw_cfg.h" #include "pci.h" -#include "trace.h" +#include "hw/vfio/trace.h" /* Use uin32_t for vendor & device so PCI_ANY_ID expands and cannot match hw */ static bool vfio_pci_is(VFIOPCIDevice *vdev, uint32_t vendor, uint32_t device) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 7bfa17c..e9d0fc9 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -30,7 +30,7 @@ #include "sysemu/kvm.h" #include "sysemu/sysemu.h" #include "pci.h" -#include "trace.h" +#include "hw/vfio/trace.h" #include "qapi/error.h" #define MSIX_CAP_LENGTH 12 diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index a559e7b..5ddfb30 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -26,7 +26,7 @@ #include "exec/memory.h" #include "qemu/queue.h" #include "hw/sysbus.h" -#include "trace.h" +#include "hw/vfio/trace.h" #include "hw/platform-bus.h" #include "sysemu/kvm.h" diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 7443d34..b1b9895 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -16,7 +16,7 @@ #include "hw/vfio/vfio-common.h" #include "hw/hw.h" #include "qemu/error-report.h" -#include "trace.h" +#include "hw/vfio/trace.h" static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *section) {