aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-14 11:36:16 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-27 20:30:20 -0500
commite8935eefe56070a37ece62e2d7f8e45c6c9356da (patch)
treedf331b365544ba4d0d35b4772babe3bfcf4ee934 /hw/pc.c
parent3a38d437ca60ce19ee92dbabbe6e672e9ba3c529 (diff)
downloadqemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.zip
qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.tar.gz
qemu-e8935eefe56070a37ece62e2d7f8e45c6c9356da.tar.bz2
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/pc.c')
-rw-r--r--hw/pc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 915e691..9dad104 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1376,9 +1376,7 @@ static void pc_init1(ram_addr_t ram_size,
}
}
- isa_dev = isa_create_simple("i8042", 0x60, 0x64);
- isa_connect_irq(isa_dev, 0, 1);
- isa_connect_irq(isa_dev, 1, 12);
+ isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12);
DMA_init(0);
#ifdef HAS_AUDIO
audio_init(pci_enabled ? pci_bus : NULL, isa_irq);