diff options
| author | Greg Kurz <gkurz@linux.vnet.ibm.com> | 2014-08-27 18:17:12 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2014-09-23 10:48:06 -0500 |
| commit | 07178559a95e49a3da2e3b226efffc28f1bd134d (patch) | |
| tree | 85fd27fbc99b180125836e5f06e383488b29e2ed /include | |
| parent | 3cb451edb23d2dda4226a861b6436ba3ce5ff4cb (diff) | |
| download | qemu-07178559a95e49a3da2e3b226efffc28f1bd134d.tar.gz | |
Revert "spapr_pci: map the MSI window in each PHB"
This patch is predicated on cc943c, which was dropped from
stable tree for other reasons.
This reverts commit 0824ca6bd126b97fac18d12d514823463f415bec.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/pci-host/spapr.h | 2 | ||||
| -rw-r--r-- | include/hw/ppc/spapr.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h index 4ea2a0d14a..32f0aa7d10 100644 --- a/include/hw/pci-host/spapr.h +++ b/include/hw/pci-host/spapr.h @@ -70,7 +70,7 @@ struct sPAPRPHBState { MemoryRegion memspace, iospace; hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size; - MemoryRegion memwindow, iowindow, msiwindow; + MemoryRegion memwindow, iowindow; uint32_t dma_liobn; AddressSpace iommu_as; diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 832ad6b0ea..bbba51a703 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -13,6 +13,8 @@ struct sPAPRNVRAM; typedef struct sPAPREnvironment { struct VIOsPAPRBus *vio_bus; QLIST_HEAD(, sPAPRPHBState) phbs; + hwaddr msi_win_addr; + MemoryRegion msiwindow; struct sPAPRNVRAM *nvram; XICSState *icp; |