Attachment 578623 Details for Bug 729244 – Patch commit using modified Markus's hack

[patch] Patch commit using modified Markus's hack

commit.patch (text/plain), 1.48 KB, created by Pavel Hrdina on 2012-04-19 11:54:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Hrdina

Created: 2012-04-19 11:54:35 UTC

Size: 1.48 KB

patch

obsolete

>diff --git a/hw/fdc.c b/hw/fdc.c
>index 3c28c52..039b446 100644
>--- a/hw/fdc.c
>+++ b/hw/fdc.c
>@@ -291,12 +291,30 @@ static void fd_revalidate (fdrive_t *drv)
>         drv->max_track = max_track;
>         drv->last_sect = last_sect;
>         drv->ro = ro;
>+    } else if (drv->bs != NULL) {
>+        FLOPPY_DPRINTF("No media in drive\n");
>+        drv->last_sect = 0;
>+        drv->max_track = 0;
>+        drv->flags &= ~FDISK_DBL_SIDES;
>+
>+        /*
>+         * We need to use this hack otherwise guest does *not*
>+         * see floppy drive at all (although QEMU has records
>+         * of the drive in "info block" monitor command output).
>+         * Drive is set to 1.44 MB 3"1/2
>+         */
>+        if (drv->drive == FDRIVE_DRV_NONE) {
>+            drv->drive = fd_formats[0].drive;
>+            drv->last_sect = fd_formats[0].last_sect;
>+            drv->max_track = fd_formats[0].max_track;
>+        }
>     } else {
>-        FLOPPY_DPRINTF("No disk in drive\n");
>+        FLOPPY_DPRINTF("Drive disabled\n");
>         drv->last_sect = 0;
>         drv->max_track = 0;
>         drv->flags &= ~FDISK_DBL_SIDES;
>     }
>+
> }
> 
> /********************************************************/
>@@ -1000,6 +1018,9 @@ static int fdctrl_media_changed(fdrive_t *drv)
> 
>     if (!drv->bs)
>         return 0;
>+    /* This is needed for driver to detect there is no media in drive */
>+    if (!bdrv_is_inserted(drv->bs))
>+        return 1;
>     if (drv->media_changed) {
>         drv->media_changed = 0;
>         ret = 1;

Actions: View | Diff

Attachments on bug 729244: 577268 | 578623 | 600264 | 633637