[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 41/55] fdc: Make media change detection more robust
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 41/55] fdc: Make media change detection more robust |
Date: |
Wed, 20 Jul 2011 18:24:15 +0200 |
fdctrl_change_cb() gets called on a virtual media change via monitor.
It would be nice if host device block drivers called it on physical
media change, but they don't.
bdrv_media_changed() lets you poll for media change, but it returns
"don't know" except with block driver "host_floppy".
FDrive member media_changed gets set on device initialization and by
fdctrl_change_cb(), and cleared by fdctrl_media_changed(). Thus, it's
set on first entry to fdctrl_media_changed() since device
initialization or virtual media change.
fdctrl_media_changed() ignores media_changed unless
bdrv_media_changed() returns "don't know". If we change media via
monitor (setting media_changed), and the new media's block driver
returns 0, we lose. Fortunately, "host_floppy" always returns 1 on
first call. Brittle. Clean it up not to rely on it.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/fdc.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index a2d8aae..6854e15 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -898,11 +898,15 @@ static int fdctrl_media_changed(FDrive *drv)
if (!drv->bs)
return 0;
- ret = bdrv_media_changed(drv->bs);
- if (ret < 0) {
- ret = drv->media_changed;
+ if (drv->media_changed) {
+ drv->media_changed = 0;
+ ret = 1;
+ } else {
+ ret = bdrv_media_changed(drv->bs);
+ if (ret < 0) {
+ ret = 0; /* we don't know, assume no */
+ }
}
- drv->media_changed = 0;
if (ret) {
fd_revalidate(drv);
}
--
1.7.2.3
- Re: [Qemu-devel] [PATCH 49/55] block: Declare qemu_blockalign() in block.h, not block_int.h, (continued)
- [Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 52/55] block: Move BlockDriverAIOCB & friends from block_int.h to block.h, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 38/55] scsi-disk: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 51/55] block: Reset buffer alignment on detach, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 37/55] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 41/55] fdc: Make media change detection more robust,
Markus Armbruster <=
- [Qemu-devel] [PATCH 30/55] block: Rename bdrv_set_locked() to bdrv_lock_medium(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 35/55] scsi-disk: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 45/55] block: Clean up remaining users of "removable", Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, Markus Armbruster, 2011/07/20