From patchwork Fri Jan 6 15:55:24 2017 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: 712021 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 3tw93w3PKsz9t0q for ; Sat, 7 Jan 2017 03:29:16 +1100 (AEDT) Received: from localhost ([::1]:53628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPXOB-00021n-MB for incoming@patchwork.ozlabs.org; Fri, 06 Jan 2017 11:29:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPWsh-0004ck-Gx for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPWsg-0005CJ-9q for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39354) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cPWsg-0005Bk-4F for qemu-devel@nongnu.org; Fri, 06 Jan 2017 10:56:38 -0500 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 36F7B21725 for ; Fri, 6 Jan 2017 15:56:38 +0000 (UTC) Received: from t460.redhat.com (ovpn-116-194.ams2.redhat.com [10.36.116.194]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v06FtlGR030318; Fri, 6 Jan 2017 10:56:36 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 6 Jan 2017 15:55:24 +0000 Message-Id: <20170106155543.12827-29-berrange@redhat.com> In-Reply-To: <20170106155543.12827-1-berrange@redhat.com> References: <20170106155543.12827-1-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.28]); Fri, 06 Jan 2017 15:56:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 28/47] trace: switch hw/pci/ 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/pci/ directory to include the hw/pci/trace.h file instead of the global trace.h file. Signed-off-by: Daniel P. Berrange --- Makefile.objs | 2 +- hw/pci/Makefile.objs | 2 ++ hw/pci/pci.c | 2 +- hw/pci/pci_host.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 42cd94e..66ffeca 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -146,7 +146,7 @@ trace-events-subdirs += hw/mem trace-events-subdirs += hw/i386 trace-events-subdirs += hw/9pfs trace-events-subdirs += hw/ppc -trace-events-y += hw/pci/trace-events +trace-events-subdirs += hw/pci trace-events-y += hw/s390x/trace-events trace-events-y += hw/vfio/trace-events trace-events-y += hw/acpi/trace-events diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 9f905e6..b075774 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -7,3 +7,5 @@ common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o common-obj-$(CONFIG_ALL) += pci-stub.o +trace-obj-y += trace.o +trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace.o diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 24fae16..8c1c7b9 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -34,7 +34,7 @@ #include "qemu/error-report.h" #include "qemu/range.h" #include "qmp-commands.h" -#include "trace.h" +#include "hw/pci/trace.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "exec/address-spaces.h" diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index 5eaa935..2ecf5b9 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -22,7 +22,7 @@ #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" -#include "trace.h" +#include "hw/pci/trace.h" /* debug PCI */ //#define DEBUG_PCI