diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2013-07-23 23:16:45 +0200 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2013-07-31 23:25:27 +0200 |
| commit | 768d7e2c7f5d20f412506f3a31626185ac54c559 (patch) | |
| tree | 8cb653a3c79201111664c825205dc3240015faaf | |
| parent | 1197cbb9eda1dc82e2fa1815ca62bc3de158353e (diff) | |
| download | qemu-768d7e2c7f5d20f412506f3a31626185ac54c559.tar.gz | |
pci-host/prep: Set isa_mem_base in the PCI host bridge
Currently, it is done by i82378 PCI-ISA bridge, which shouldn't
care about it.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
| -rw-r--r-- | hw/isa/i82378.c | 3 | ||||
| -rw-r--r-- | hw/pci-host/prep.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index a542134585..9b8674a0fb 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -45,7 +45,6 @@ typedef struct I82378State { typedef struct PCIi82378State { PCIDevice pci_dev; uint32_t isa_io_base; - uint32_t isa_mem_base; I82378State state; } PCIi82378State; @@ -234,7 +233,6 @@ static int pci_i82378_init(PCIDevice *dev) pci_set_long(dev->wmask + PCI_BASE_ADDRESS_0, 0); pci_set_long(pci_conf + PCI_BASE_ADDRESS_0, pci->isa_io_base); - isa_mem_base = pci->isa_mem_base; isa_bus_new(&dev->qdev, pci_address_space_io(dev)); i82378_init(&dev->qdev, s); @@ -244,7 +242,6 @@ static int pci_i82378_init(PCIDevice *dev) static Property i82378_properties[] = { DEFINE_PROP_HEX32("iobase", PCIi82378State, isa_io_base, 0x80000000), - DEFINE_PROP_HEX32("membase", PCIi82378State, isa_mem_base, 0xc0000000), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 09d3b32291..e120058511 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -119,6 +119,8 @@ static void raven_pcihost_realizefn(DeviceState *d, Error **errp) MemoryRegion *address_space_mem = get_system_memory(); int i; + isa_mem_base = 0xc0000000; + for (i = 0; i < 4; i++) { sysbus_init_irq(dev, &s->irq[i]); } |