diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-09-10 11:43:27 +0200 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2009-09-10 19:47:59 +0400 |
| commit | 2e15e23b8a3c5da5576b7ea8631c956381eea0d5 (patch) | |
| tree | 6b58c916a271c2fa707f39210a71094a4cfafe06 /hw/pckbd.c | |
| parent | 86c861578453b544fa67ad50d28c4460bee068c5 (diff) | |
| download | qemu-2e15e23b8a3c5da5576b7ea8631c956381eea0d5.tar.gz qemu-2e15e23b8a3c5da5576b7ea8631c956381eea0d5.tar.bz2 qemu-2e15e23b8a3c5da5576b7ea8631c956381eea0d5.zip | |
qdev: simplify isa irq assignments
isa-bus owns the isa irqs now, so it can hand them out directly.
There is no need for the separate isa_connect_irqs step, drop it.
Also hard-code isa interrupts which can't be configured anyway.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/pckbd.c')
| -rw-r--r-- | hw/pckbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pckbd.c b/hw/pckbd.c index b4b65a6604..5acf4a6338 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -450,8 +450,8 @@ static int i8042_initfn(ISADevice *dev) { KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd); - isa_init_irq(dev, &s->irq_kbd); - isa_init_irq(dev, &s->irq_mouse); + isa_init_irq(dev, &s->irq_kbd, 1); + isa_init_irq(dev, &s->irq_mouse, 12); kbd_reset(s); register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); |