Commit 07a978ef authored by Markus Armbruster's avatar Markus Armbruster
Browse files

fdc: Fix fallback=auto error handling 



fdctrl_realize_common() rejects fallback=auto.  Used by devices
"isa-fdc", "sysbus-fdc", "SUNW,fdtwo".  The error handling is broken:

    $ qemu-system-x86_64 -nodefaults -device isa-fdc,fallback=auto,driveA=fd0 -drive if=none,id=fd0
    **
    ERROR:/work/armbru/qemu/hw/block/fdc.c:434:pick_drive_type: assertion failed: (drv->drive != FLOPPY_DRIVE_TYPE_AUTO)
    Aborted (core dumped)

Cause: fdctrl_realize_common() neglects to bail out after setting the
error.  Fix that.

Fixes: a73275dd
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200422130719.28225-7-armbru@redhat.com>
parent 0fbddcec

hw/block/fdc.c

+1 −0
Original line number Diff line number Diff line
@@ -2615,6 +2615,7 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, 


    if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) {

        error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");

        return;

    }



    /* Fill 'command_to_handler' lookup table */