[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/7] pci: Move PCI and PCIE type defines
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 2/7] pci: Move PCI and PCIE type defines |
Date: |
Thu, 14 Mar 2013 16:01:05 -0600 |
User-agent: |
StGit/0.16 |
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 <address@hidden>
---
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;
- [Qemu-devel] [PATCH 0/7] pci: Create PCI Express bus type, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 1/7] pci: Create and register a new PCI Express TypeInfo, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 2/7] pci: Move PCI and PCIE type defines,
Alex Williamson <=
- [Qemu-devel] [PATCH 3/7] pci: Allow PCI bus creation interfaces to specify the type of bus, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 5/7] pci: Create pci_bus_is_express helper, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 4/7] pci: Q35, Root Ports, and Switches create PCI Express buses, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 6/7] pci: Create and use API to determine root buses, Alex Williamson, 2013/03/14
- [Qemu-devel] [PATCH 7/7] pcie: Mangle types to match topology, Alex Williamson, 2013/03/14
- Re: [Qemu-devel] [PATCH 0/7] pci: Create PCI Express bus type, Michael S. Tsirkin, 2013/03/17