summaryrefslogtreecommitdiffstats
path: root/hw/alpha
diff options
context:
space:
mode:
authorHervé Poussineau2015-02-01 09:12:50 +0100
committerLeon Alrae2015-02-13 15:09:27 +0100
commitbb2ed009e7e4b278c0234143f6b6c1126f68ba35 (patch)
tree2cb7cb302484dc2ed4a95f511758575b1359dd01 /hw/alpha
parentMerge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150212' into staging (diff)
downloadqemu-bb2ed009e7e4b278c0234143f6b6c1126f68ba35.tar.gz
qemu-bb2ed009e7e4b278c0234143f6b6c1126f68ba35.tar.xz
qemu-bb2ed009e7e4b278c0234143f6b6c1126f68ba35.zip
isa: add memory space parameter to isa_bus_new
Currently, keep current behaviour by always using get_system_memory(). Also use QOM casts when possible. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
Diffstat (limited to 'hw/alpha')
-rw-r--r--hw/alpha/typhoon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 53100061d2..62af946105 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -920,7 +920,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
{
qemu_irq isa_pci_irq, *isa_irqs;
- *isa_bus = isa_bus_new(NULL, &s->pchip.reg_io);
+ *isa_bus = isa_bus_new(NULL, get_system_memory(), &s->pchip.reg_io);
isa_pci_irq = *qemu_allocate_irqs(typhoon_set_isa_irq, s, 1);
isa_irqs = i8259_init(*isa_bus, isa_pci_irq);
isa_bus_irqs(*isa_bus, isa_irqs);