diff options
| author | Hervé Poussineau <hpoussin@reactos.org> | 2011-12-15 22:09:51 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-20 15:44:30 -0600 |
| commit | 48a18b3c698295e4d891f34e919615e84e20f027 (patch) | |
| tree | 689d5ec205341895b0eef457f3c0313be53b5432 /hw/i8259.c | |
| parent | 0fa29915cdcadb5853515703d3eca8992627dcf2 (diff) | |
isa: give ISABus/ISADevice to isa_create(), isa_bus_irqs() and isa_get_irq() functions
NULL is a valid bus/device, so there is no change in behaviour.
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i8259.c')
| -rw-r--r-- | hw/i8259.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/i8259.c b/hw/i8259.c index ab519de5d8..4446339037 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -518,7 +518,7 @@ void irq_info(Monitor *mon) #endif } -qemu_irq *i8259_init(qemu_irq parent_irq) +qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) { qemu_irq *irq_set; ISADevice *dev; @@ -526,7 +526,7 @@ qemu_irq *i8259_init(qemu_irq parent_irq) irq_set = g_malloc(ISA_NUM_IRQS * sizeof(qemu_irq)); - dev = isa_create("isa-i8259"); + dev = isa_create(bus, "isa-i8259"); qdev_prop_set_uint32(&dev->qdev, "iobase", 0x20); qdev_prop_set_uint32(&dev->qdev, "elcr_addr", 0x4d0); qdev_prop_set_uint8(&dev->qdev, "elcr_mask", 0xf8); @@ -540,7 +540,7 @@ qemu_irq *i8259_init(qemu_irq parent_irq) isa_pic = DO_UPCAST(PicState, dev, dev); - dev = isa_create("isa-i8259"); + dev = isa_create(bus, "isa-i8259"); qdev_prop_set_uint32(&dev->qdev, "iobase", 0xa0); qdev_prop_set_uint32(&dev->qdev, "elcr_addr", 0x4d1); qdev_prop_set_uint8(&dev->qdev, "elcr_mask", 0xde); |