diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2013-03-14 16:01:05 -0600 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-03-26 21:02:18 +0200 |
| commit | cf09458d644934976aa64e88bb41ef9a4cc2766a (patch) | |
| tree | 55fd10ece8f00d66e48e5808264835fc48feab6c | |
| parent | 3a861c466cee46fed042d76100fa0fd9644f3091 (diff) | |
| download | focaccia-qemu-cf09458d644934976aa64e88bb41ef9a4cc2766a.tar.gz focaccia-qemu-cf09458d644934976aa64e88bb41ef9a4cc2766a.zip | |
pci: Move PCI and PCIE type defines
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 <alex.williamson@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci/pci.h | 5 | ||||
| -rw-r--r-- | 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 d837a65c2d..37fb52222f 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 6d3155f14b..6ee443cf88 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; |