]> Git Repo - qemu.git/commitdiff
hw/alpha/typhoon.c: Fix misusing qemu_allocate_irqs for single irq
authorShannon Zhao <[email protected]>
Fri, 29 May 2015 05:27:09 +0000 (13:27 +0800)
committerMichael Tokarev <[email protected]>
Wed, 3 Jun 2015 11:21:24 +0000 (14:21 +0300)
Signed-off-by: Shannon Zhao <[email protected]>
Signed-off-by: Shannon Zhao <[email protected]>
Signed-off-by: Michael Tokarev <[email protected]>
hw/alpha/typhoon.c

index 7df842dff77ef26d74ecaadd889028e480e956a2..421162e1d48200bb16062a7817da654b6c1a80b6 100644 (file)
@@ -841,7 +841,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
         }
     }
 
-    *p_rtc_irq = *qemu_allocate_irqs(typhoon_set_timer_irq, s, 1);
+    *p_rtc_irq = qemu_allocate_irq(typhoon_set_timer_irq, s, 0);
 
     /* Main memory region, 0x00.0000.0000.  Real hardware supports 32GB,
        but the address space hole reserved at this point is 8TB.  */
@@ -918,11 +918,11 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus,
     /* Init the ISA bus.  */
     /* ??? Technically there should be a cy82c693ub pci-isa bridge.  */
     {
-        qemu_irq isa_pci_irq, *isa_irqs;
+        qemu_irq *isa_irqs;
 
         *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_irqs = i8259_init(*isa_bus,
+                              qemu_allocate_irq(typhoon_set_isa_irq, s, 0));
         isa_bus_irqs(*isa_bus, isa_irqs);
     }
 
This page took 0.02822 seconds and 4 git commands to generate.