diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2012-11-01 16:42:49 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2012-11-01 16:42:49 +0100 |
| commit | 46a3f234134a708883c4ace95d739f6226bb17f0 (patch) | |
| tree | d06a33ad6133dc0ecf7f46b2804d129bf424fb93 /hw/spapr_pci.h | |
| parent | 735c1eeb85450acd551c5990952f7ed8512d8547 (diff) | |
| parent | 1ecbbab46925d4810fc35aba45cf93cb80ff0734 (diff) | |
| download | focaccia-qemu-46a3f234134a708883c4ace95d739f6226bb17f0.tar.gz focaccia-qemu-46a3f234134a708883c4ace95d739f6226bb17f0.zip | |
Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf: pseries: Cleanup duplications of ics_valid_irq() code pseries: Clean up inconsistent variable name in xics.c target-ppc: Extend FPU state for newer POWER CPUs target-ppc: Rework storage of VPA registration state Revert "PPC: pseries: Remove hack for PIO window"
Diffstat (limited to 'hw/spapr_pci.h')
| -rw-r--r-- | hw/spapr_pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index a77d7d5448..e307ac8035 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h @@ -44,7 +44,7 @@ typedef struct sPAPRPHBState { MemoryRegion memspace, iospace; hwaddr mem_win_addr, mem_win_size, io_win_addr, io_win_size; hwaddr msi_win_addr; - MemoryRegion memwindow, msiwindow; + MemoryRegion memwindow, iowindow, msiwindow; uint32_t dma_liobn; uint64_t dma_window_start; |