diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 11:36:16 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:30:20 -0500 |
| commit | e8935eefe56070a37ece62e2d7f8e45c6c9356da (patch) | |
| tree | df331b365544ba4d0d35b4772babe3bfcf4ee934 /hw/isa-bus.c | |
| parent | 3a38d437ca60ce19ee92dbabbe6e672e9ba3c529 (diff) | |
| download | focaccia-qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.tar.gz focaccia-qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.zip | |
Move isa_connect_irq calls into isa_create_simple
Now with isa-bus maintaining the isa irqs we can move the isa_connect_irq() calls into isa_create_simple(). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/isa-bus.c')
| -rw-r--r-- | hw/isa-bus.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 9561c3112f..ebcc081e97 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -121,7 +121,8 @@ void isa_qdev_register(ISADeviceInfo *info) qdev_register(&info->qdev); } -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2) +ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, + uint32_t irq, uint32 irq2) { DeviceState *dev; ISADevice *isa; @@ -135,6 +136,10 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2 isa->iobase[0] = iobase; isa->iobase[1] = iobase2; qdev_init(dev); + if (-1 != irq) + isa_connect_irq(isa, 0, irq); + if (-1 != irq2) + isa_connect_irq(isa, 1, irq2); return isa; } |