mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
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>
This commit is contained in:
parent
3a38d437ca
commit
e8935eefe5
4 changed files with 10 additions and 7 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue