[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, t
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work |
Date: |
Wed, 20 Jul 2011 18:24:29 +0200 |
change fails while the tray is locked by the guest. eject -f forces
it open and removes any media. Unfortunately, the tray closes again
instantly. Since the lock remains as it is, there is no way to insert
another medium unless the guest voluntarily unlocks.
Fix by leaving the tray open after monitor eject.
Signed-off-by: Markus Armbruster <address@hidden>
---
blockdev.c | 3 ++-
hw/ide/core.c | 1 +
hw/scsi-disk.c | 1 +
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 9284afd..197f57f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -644,7 +644,8 @@ static int eject_device(Monitor *mon, BlockDriverState *bs,
int force)
qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
return -1;
}
- if (!force && bdrv_dev_is_medium_locked(bs)) {
+ if (!force && !bdrv_dev_is_medium_ejected(bs)
+ && bdrv_dev_is_medium_locked(bs)) {
qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
return -1;
}
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 05ed7e9..77eef58 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -763,6 +763,7 @@ static void ide_cd_change_cb(void *opaque, bool load)
IDEState *s = opaque;
uint64_t nb_sectors;
+ s->tray_open = !load;
bdrv_get_geometry(s->bs, &nb_sectors);
s->nb_sectors = nb_sectors;
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 4f28e9c..3d245fe 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1278,6 +1278,7 @@ static void scsi_destroy(SCSIDevice *dev)
static void scsi_cd_change_media_cb(void *opaque, bool load)
{
+ ((SCSIDiskState *)opaque)->tray_open = !load;
}
static bool scsi_cd_is_medium_ejected(void *opaque)
--
1.7.2.3
- [Qemu-devel] [PATCH 30/55] block: Rename bdrv_set_locked() to bdrv_lock_medium(), (continued)
- [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
- [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work,
Markus Armbruster <=
- [Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's locked to own tray_locked, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for microdrive" test, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 43/55] savevm: Include writable devices with removable media, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 29/55] block: Drop medium lock tracking, ask device models instead, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 22/55] block: Drop tray status tracking, no longer used, Markus Armbruster, 2011/07/20