From patchwork Wed Dec 12 13:14:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 205510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A01E82C009B for ; Thu, 13 Dec 2012 00:25:05 +1100 (EST) Received: from localhost ([::1]:38984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim6p-0002q6-HF for incoming@patchwork.ozlabs.org; Wed, 12 Dec 2012 08:12:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim63-0001Rh-7c for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:11:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tim5o-0002jR-BC for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:11:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42470) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tim5o-0002jN-4b for qemu-devel@nongnu.org; Wed, 12 Dec 2012 08:11:20 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBCDBJSL011941 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 12 Dec 2012 08:11:19 -0500 Received: from redhat.com (vpn1-7-32.ams2.redhat.com [10.36.7.32]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id qBCDBIol017263 for ; Wed, 12 Dec 2012 08:11:18 -0500 Date: Wed, 12 Dec 2012 15:14:30 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <8880d93a99c99d1162db75f564f459efe050dd90.1355318011.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 5/8] pci: make external dependencies explicit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Include dependencies from pci core using <> and the correct path. Need to check whether they can be minimized, for now, at least make them explicit. Signed-off-by: Michael S. Tsirkin --- hw/pci/msix.c | 4 ++-- hw/pci/pci-hotplug.c | 20 ++++++++++---------- hw/pci/pci.c | 16 ++++++++-------- hw/pci/pci.h | 10 +++++----- hw/pci/pci_host.h | 2 +- hw/pci/pcie.h | 2 +- hw/pci/pcie_aer.h | 2 +- hw/pci/pcie_host.c | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 136ef09..ec35a5d 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -14,11 +14,11 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw.h" +#include #include "msi.h" #include "msix.h" #include "pci.h" -#include "range.h" +#include #define MSIX_CAP_LENGTH 12 diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c index 0ca5546..32ba449 100644 --- a/hw/pci/pci-hotplug.c +++ b/hw/pci/pci-hotplug.c @@ -22,17 +22,17 @@ * THE SOFTWARE. */ -#include "hw.h" -#include "boards.h" +#include +#include #include "pci.h" -#include "net.h" -#include "pc.h" -#include "monitor.h" -#include "scsi.h" -#include "virtio-blk.h" -#include "qemu-config.h" -#include "blockdev.h" -#include "error.h" +#include +#include +#include +#include +#include +#include +#include +#include #if defined(TARGET_I386) static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 97a0cd7..6023ded 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -21,19 +21,19 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" +#include #include "pci.h" #include "pci_bridge.h" #include "pci_internals.h" -#include "monitor.h" -#include "net.h" -#include "sysemu.h" -#include "loader.h" -#include "range.h" -#include "qmp-commands.h" +#include +#include +#include +#include +#include +#include #include "msi.h" #include "msix.h" -#include "exec-memory.h" +#include //#define DEBUG_PCI #ifdef DEBUG_PCI diff --git a/hw/pci/pci.h b/hw/pci/pci.h index 4da0c2a..b517995 100644 --- a/hw/pci/pci.h +++ b/hw/pci/pci.h @@ -1,14 +1,14 @@ #ifndef QEMU_PCI_H #define QEMU_PCI_H -#include "qemu-common.h" +#include -#include "qdev.h" -#include "memory.h" -#include "dma.h" +#include +#include +#include /* PCI includes legacy ISA access. */ -#include "isa.h" +#include #include "pcie.h" diff --git a/hw/pci/pci_host.h b/hw/pci/pci_host.h index 4b9c300..6dfb38d 100644 --- a/hw/pci/pci_host.h +++ b/hw/pci/pci_host.h @@ -28,7 +28,7 @@ #ifndef PCI_HOST_H #define PCI_HOST_H -#include "sysbus.h" +#include #define TYPE_PCI_HOST_BRIDGE "pci-host-bridge" #define PCI_HOST_BRIDGE(obj) \ diff --git a/hw/pci/pcie.h b/hw/pci/pcie.h index 4889194..cc1f2c5 100644 --- a/hw/pci/pcie.h +++ b/hw/pci/pcie.h @@ -21,7 +21,7 @@ #ifndef QEMU_PCIE_H #define QEMU_PCIE_H -#include "hw.h" +#include #include "pci_regs.h" #include "pcie_regs.h" #include "pcie_aer.h" diff --git a/hw/pci/pcie_aer.h b/hw/pci/pcie_aer.h index 7539500..406a736 100644 --- a/hw/pci/pcie_aer.h +++ b/hw/pci/pcie_aer.h @@ -21,7 +21,7 @@ #ifndef QEMU_PCIE_AER_H #define QEMU_PCIE_AER_H -#include "hw.h" +#include /* definitions which PCIExpressDevice uses */ diff --git a/hw/pci/pcie_host.c b/hw/pci/pcie_host.c index c257fb4..4453cb0 100644 --- a/hw/pci/pcie_host.c +++ b/hw/pci/pcie_host.c @@ -19,10 +19,10 @@ * with this program; if not, see . */ -#include "hw.h" +#include #include "pci.h" #include "pcie_host.h" -#include "exec-memory.h" +#include /* * PCI express mmcfig address