diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-31 10:42:51 +0100 |
| commit | f563a5d7a820424756f358e747238f03e866838a (patch) | |
| tree | f78fa474b1933bd395af401a6d745150f4ecd15e /hw/pcie_host.h | |
| parent | a27365265cc2fed1178bf25a205e8ee02a9c0caf (diff) | |
| parent | aee0bf7d8d7564f8f2c40e4501695c492b7dd8d1 (diff) | |
| download | qemu-f563a5d7a820424756f358e747238f03e866838a.tar.gz | |
Merge remote-tracking branch 'origin/master' into threadpool
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/pcie_host.h')
| -rw-r--r-- | hw/pcie_host.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/pcie_host.h b/hw/pcie_host.h index 9978b9f2f1..392193530d 100644 --- a/hw/pcie_host.h +++ b/hw/pcie_host.h @@ -24,6 +24,10 @@ #include "pci_host.h" #include "memory.h" +#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge" +#define PCIE_HOST_BRIDGE(obj) \ + OBJECT_CHECK(PCIExpressHost, (obj), TYPE_PCIE_HOST_BRIDGE) + struct PCIExpressHost { PCIHostState pci; @@ -39,11 +43,12 @@ struct PCIExpressHost { MemoryRegion mmio; }; -int pcie_host_init(PCIExpressHost *e, uint32_t size); +int pcie_host_init(PCIExpressHost *e); void pcie_host_mmcfg_unmap(PCIExpressHost *e); -void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr); +void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, uint32_t size); void pcie_host_mmcfg_update(PCIExpressHost *e, int enable, - hwaddr addr); + hwaddr addr, + uint32_t size); #endif /* PCIE_HOST_H */ |