diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2009-08-14 11:36:14 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-27 20:30:11 -0500 |
| commit | 2091ba23e838c3a8773c246238d7381333789852 (patch) | |
| tree | f0fe63782f1532c1d193a92a701d11e1544e1fde /hw/sun4u.c | |
| parent | 3f9cb1c14dc368f41447db5f78d6248c4f100ad4 (diff) | |
isa bus irq changes and fixes.
Changes:
(1) make isa-bus maintain isa irqs, complain when allocating
already taken irqs.
(2) note that (1) works only for isa devices converted to qdev
already (floppy and ps2/kbd/mouse right now), so more work
is needed to make this really useful.
(3) split floppy init into isa and sysbus versions.
(4) add sysbus->isa bridge & fix -M isapc breakage.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/sun4u.c')
| -rw-r--r-- | hw/sun4u.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index bc832557dc..09027e2f91 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -618,7 +618,7 @@ static void sun4uv_init(ram_addr_t RAM_size, dinfo = drive_get(IF_FLOPPY, 0, i); fd[i] = dinfo ? dinfo->bdrv : NULL; } - floppy_controller = fdctrl_init(NULL/*6*/, 2, 0, 0x3f0, fd); + floppy_controller = fdctrl_init_isa(6, 2, 0x3f0, fd); nvram = m48t59_init(NULL/*8*/, 0, 0x0074, NVRAM_SIZE, 59); initrd_size = 0; |