From: Shannon Zhao Date: Fri, 29 May 2015 05:27:01 +0000 (+0800) Subject: hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq X-Git-Tag: v2.4.0-rc0~100^2~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5105505e65ba6bc3e1dc549bcd0d1d33f3546e60;p=thirdparty%2Fqemu.git hw/isa/i82378.c: Fix misusing qemu_allocate_irqs for single irq Signed-off-by: Shannon Zhao Signed-off-by: Shannon Zhao Signed-off-by: Michael Tokarev --- diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 9da9dfc4dac..fcf97d86ac7 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -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) */