[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 10/38] hw/block/fdc: Implement tray status
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 10/38] hw/block/fdc: Implement tray status |
Date: |
Fri, 18 Sep 2015 17:22:45 +0200 |
The tray of an FDD is open iff there is no medium inserted (there are
only two states for an FDD: "medium inserted" or "no medium inserted").
Signed-off-by: Max Reitz <address@hidden>
---
hw/block/fdc.c | 20 ++++++++++++++++----
tests/fdc-test.c | 4 +---
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 6686a72..4292ece 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -192,6 +192,8 @@ typedef struct FDrive {
uint8_t ro; /* Is read-only */
uint8_t media_changed; /* Is media changed */
uint8_t media_rate; /* Data rate of medium */
+
+ bool media_inserted; /* Is there a medium in the tray */
} FDrive;
static void fd_init(FDrive *drv)
@@ -261,7 +263,7 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t
track, uint8_t sect,
#endif
drv->head = head;
if (drv->track != track) {
- if (drv->blk != NULL && blk_is_inserted(drv->blk)) {
+ if (drv->media_inserted) {
drv->media_changed = 0;
}
ret = 1;
@@ -270,7 +272,7 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t
track, uint8_t sect,
drv->sect = sect;
}
- if (drv->blk == NULL || !blk_is_inserted(drv->blk)) {
+ if (!drv->media_inserted) {
ret = 2;
}
@@ -296,7 +298,7 @@ static void fd_revalidate(FDrive *drv)
ro = blk_is_read_only(drv->blk);
pick_geometry(drv->blk, &nb_heads, &max_track,
&last_sect, drv->drive, &drive, &rate);
- if (!blk_is_inserted(drv->blk)) {
+ if (!drv->media_inserted) {
FLOPPY_DPRINTF("No disk in drive\n");
} else {
FLOPPY_DPRINTF("Floppy disk (%d h %d t %d s) %s\n", nb_heads,
@@ -692,7 +694,7 @@ static bool fdrive_media_changed_needed(void *opaque)
{
FDrive *drive = opaque;
- return (drive->blk != NULL && drive->media_changed != 1);
+ return (drive->media_inserted && drive->media_changed != 1);
}
static const VMStateDescription vmstate_fdrive_media_changed = {
@@ -2184,12 +2186,21 @@ static void fdctrl_change_cb(void *opaque, bool load)
{
FDrive *drive = opaque;
+ drive->media_inserted = load && drive->blk && blk_is_inserted(drive->blk);
+
drive->media_changed = 1;
fd_revalidate(drive);
}
+static bool fdctrl_is_tray_open(void *opaque)
+{
+ FDrive *drive = opaque;
+ return !drive->media_inserted;
+}
+
static const BlockDevOps fdctrl_block_ops = {
.change_media_cb = fdctrl_change_cb,
+ .is_tray_open = fdctrl_is_tray_open,
};
/* Init functions */
@@ -2217,6 +2228,7 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, Error
**errp)
fdctrl_change_cb(drive, 0);
if (drive->blk) {
blk_set_dev_ops(drive->blk, &fdctrl_block_ops, drive);
+ drive->media_inserted = blk_is_inserted(drive->blk);
}
}
}
diff --git a/tests/fdc-test.c b/tests/fdc-test.c
index 416394f..b5a4696 100644
--- a/tests/fdc-test.c
+++ b/tests/fdc-test.c
@@ -304,9 +304,7 @@ static void test_media_insert(void)
qmp_discard_response("{'execute':'change', 'arguments':{"
" 'device':'floppy0', 'target': %s, 'arg': 'raw' }}",
test_image);
- qmp_discard_response(""); /* ignore event
- (FIXME open -> open transition?!) */
- qmp_discard_response(""); /* ignore event */
+ qmp_discard_response(""); /* ignore event (open -> close) */
dir = inb(FLOPPY_BASE + reg_dir);
assert_bit_set(dir, DSKCHG);
--
2.5.2
- [Qemu-devel] [PATCH v5 05/38] block: Make bdrv_is_inserted() return a bool, (continued)
- [Qemu-devel] [PATCH v5 05/38] block: Make bdrv_is_inserted() return a bool, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 03/38] blockdev: Allow creation of BDS trees without BB, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 06/38] block: Add blk_is_available(), Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 07/38] block: Make bdrv_is_inserted() recursive, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 04/38] iotests: Only create BB if necessary, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 08/38] block/raw_bsd: Drop raw_is_inserted(), Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 10/38] hw/block/fdc: Implement tray status,
Max Reitz <=
- [Qemu-devel] [PATCH v5 09/38] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 11/38] hw/usb-storage: Check whether BB is inserted, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 13/38] block: Move guest_block_size into BlockBackend, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 12/38] block: Fix BB AIOCB AioContext without BDS, Max Reitz, 2015/09/18
- [Qemu-devel] [PATCH v5 14/38] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/09/18