diff options
| author | Peter Maydell | 2014-08-18 13:55:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-08-18 13:55:02 +0200 |
| commit | 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9 (patch) | |
| tree | b6840a4ace1a8d7f45dbc0ec9991aa42384d0204 /hw/sparc64 | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | target-sparc64: implement Short Floating-Point Store Instructions (diff) | |
| download | qemu-08ab59770da57648bfb8fc9be37f0ef7fb50b0f9.tar.gz qemu-08ab59770da57648bfb8fc9be37f0ef7fb50b0f9.tar.xz qemu-08ab59770da57648bfb8fc9be37f0ef7fb50b0f9.zip | |
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
* remotes/mcayland/qemu-sparc:
target-sparc64: implement Short Floating-Point Store Instructions
apb: add IOMMU flush register implementation
sun4u: switch second PCI-ebus bridge BAR over to PCI IO space
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sparc64')
| -rw-r--r-- | hw/sparc64/sun4u.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 33c311bf28..b9f3bee9ae 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -609,8 +609,8 @@ pci_ebus_init1(PCIDevice *pci_dev) 0, 0x1000000); pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar0); memory_region_init_alias(&s->bar1, OBJECT(s), "bar1", get_system_io(), - 0, 0x800000); - pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->bar1); + 0, 0x1000); + pci_register_bar(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->bar1); return 0; } |