From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGD0-0001JU-2A for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGGCy-0001pP-Fz for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGGCy-0001pI-9T for qemu-devel@nongnu.org; Thu, 14 Mar 2013 18:01:08 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EM164i008207 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 18:01:07 -0400 From: Alex Williamson Date: Thu, 14 Mar 2013 16:01:05 -0600 Message-ID: <20130314220105.10566.91902.stgit@bling.home> In-Reply-To: <20130314215150.10566.37912.stgit@bling.home> References: <20130314215150.10566.37912.stgit@bling.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/7] pci: Move PCI and PCIE type defines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: qemu-devel@nongnu.org Move these so that we can reference them from a more common header instead of including pci_bus.h everywhere. Signed-off-by: Alex Williamson --- hw/pci/pci.h | 5 +++++ hw/pci/pci_bus.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.h b/hw/pci/pci.h index d837a65..37fb522 100644 --- a/hw/pci/pci.h +++ b/hw/pci/pci.h @@ -339,6 +339,11 @@ typedef enum { typedef int (*pci_hotplug_fn)(DeviceState *qdev, PCIDevice *pci_dev, PCIHotplugState state); + +#define TYPE_PCI_BUS "PCI" +#define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS) +#define TYPE_PCIE_BUS "PCIE" + void pci_bus_new_inplace(PCIBus *bus, DeviceState *parent, const char *name, MemoryRegion *address_space_mem, diff --git a/hw/pci/pci_bus.h b/hw/pci/pci_bus.h index 6d3155f..6ee443c 100644 --- a/hw/pci/pci_bus.h +++ b/hw/pci/pci_bus.h @@ -8,10 +8,6 @@ * use accessor functions in pci.h, pci_bridge.h */ -#define TYPE_PCI_BUS "PCI" -#define PCI_BUS(obj) OBJECT_CHECK(PCIBus, (obj), TYPE_PCI_BUS) -#define TYPE_PCIE_BUS "PCIE" - struct PCIBus { BusState qbus; PCIDMAContextFunc dma_context_fn;