From 48a18b3c698295e4d891f34e919615e84e20f027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Thu, 15 Dec 2011 22:09:51 +0100 Subject: isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NULL is a valid bus/device, so there is no change in behaviour. Signed-off-by: Hervé Poussineau Signed-off-by: Anthony Liguori --- hw/alpha_typhoon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'hw/alpha_typhoon.c') diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index c7608bbabd..113837d014 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -791,11 +791,12 @@ PCIBus *typhoon_init(ram_addr_t ram_size, qemu_irq *p_rtc_irq, /* ??? Technically there should be a cy82c693ub pci-isa bridge. */ { qemu_irq isa_pci_irq, *isa_irqs; + ISABus *isa_bus; - isa_bus_new(NULL, addr_space_io); + isa_bus = isa_bus_new(NULL, addr_space_io); isa_pci_irq = *qemu_allocate_irqs(typhoon_set_isa_irq, s, 1); - isa_irqs = i8259_init(isa_pci_irq); - isa_bus_irqs(isa_irqs); + isa_irqs = i8259_init(isa_bus, isa_pci_irq); + isa_bus_irqs(isa_bus, isa_irqs); } return b; -- cgit v1.2.3