From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: John Snow <jsnow@redhat.com>
Subject: [PATCH 06/11] fdc: Fix fallback=auto error handling
Date: Mon, 20 Apr 2020 10:32:31 +0200 [thread overview]
Message-ID: <20200420083236.19309-7-armbru@redhat.com> (raw)
In-Reply-To: <20200420083236.19309-1-armbru@redhat.com>
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: a73275dd6fc3bfda33165bebc28e0c33c20cb0a0
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/block/fdc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 33bc9e2f92..9628cc171e 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -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 */
--
2.21.1
next prev parent reply other threads:[~2020-04-20 8:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 8:32 [PATCH 00/11] Miscellaneous error handling fixes Markus Armbruster
2020-04-20 8:32 ` [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation Markus Armbruster
2020-04-20 8:32 ` [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling Markus Armbruster
2020-04-20 15:05 ` Eric Blake
2020-04-20 8:32 ` [PATCH 03/11] cpus: Fix configure_icount() error API violation Markus Armbruster
2020-04-20 8:32 ` [PATCH 04/11] cpus: Proper range-checking for -icount shift=N Markus Armbruster
2020-04-20 8:32 ` [PATCH 05/11] arm/virt: Fix virt_machine_device_plug_cb() error API violation Markus Armbruster
2020-04-20 8:52 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` Markus Armbruster [this message]
2020-04-20 8:54 ` [PATCH 06/11] fdc: Fix fallback=auto error handling Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 07/11] bochs-display: Fix vgamem=SIZE " Markus Armbruster
2020-04-20 8:54 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 08/11] virtio-net: Fix duplex=... and speed=... " Markus Armbruster
2020-04-20 9:04 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 09/11] xen/pt: Fix flawed conversion to realize() Markus Armbruster
2020-04-20 8:58 ` Paul Durrant
2020-04-20 8:32 ` [PATCH 10/11] io: Fix qio_channel_socket_close() error handling Markus Armbruster
2020-04-20 9:34 ` Daniel P. Berrangé
2020-04-20 8:32 ` [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() " Markus Armbruster
2020-04-20 8:48 ` Zhanghailiang
2020-04-20 8:56 ` Philippe Mathieu-Daudé
2020-04-21 0:24 ` Zhang, Chen
2020-04-20 12:57 ` [PATCH 00/11] Miscellaneous error handling fixes no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420083236.19309-7-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).