]> git.proxmox.com Git - mirror_qemu.git/commitdiff
hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq
authorShannon Zhao <shannon.zhao@linaro.org>
Fri, 29 May 2015 05:27:01 +0000 (13:27 +0800)
committerMichael Tokarev <mjt@tls.msk.ru>
Wed, 3 Jun 2015 11:21:24 +0000 (14:21 +0300)
Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
hw/isa/i82378.c

index 9da9dfc4dac49430b7a4f45e59729ddc5f842434..fcf97d86ac7e9e9ea49e99aae4538468e5591d6f 100644 (file)
@@ -65,7 +65,6 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
     uint8_t *pci_conf;
     ISABus *isabus;
     ISADevice *isa;
-    qemu_irq *out0_irq;
 
     pci_conf = pci->config;
     pci_set_word(pci_conf + PCI_COMMAND,
@@ -88,11 +87,9 @@ static void i82378_realize(PCIDevice *pci, Error **errp)
        All devices accept byte access only, except timer
      */
 
-    /* Workaround the fact that i8259 is not qdev'ified... */
-    out0_irq = qemu_allocate_irqs(i82378_request_out0_irq, s, 1);
-
     /* 2 82C59 (irq) */
-    s->i8259 = i8259_init(isabus, *out0_irq);
+    s->i8259 = i8259_init(isabus,
+                          qemu_allocate_irq(i82378_request_out0_irq, s, 0));
     isa_bus_irqs(isabus, s->i8259);
 
     /* 1 82C54 (pit) */