OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ide/atapi scsi-disk: Make monitor eject -f, then change work

Browse Source 
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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-09-06 18:59:00 +02:00 committed by Kevin Wolf
parent 7d4b4ba5c2
commit 25ad22bc4e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blockdev.c
View File

@ -635,7 +635,8 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force)
qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs)); qerror_report(QERR_DEVICE_NOT_REMOVABLE, bdrv_get_device_name(bs));
return -1; return -1;
} }
if (!force && bdrv_dev_is_medium_locked(bs)) { if (!force && !bdrv_dev_is_tray_open(bs)
&& bdrv_dev_is_medium_locked(bs)) {
qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs)); qerror_report(QERR_DEVICE_LOCKED, bdrv_get_device_name(bs));
return -1; return -1;
} }

1
hw/ide/core.c
View File

@ -789,6 +789,7 @@ static void ide_cd_change_cb(void *opaque, bool load)
IDEState *s = opaque; IDEState *s = opaque;
uint64_t nb_sectors; uint64_t nb_sectors;
s->tray_open = !load;
bdrv_get_geometry(s->bs, &nb_sectors); bdrv_get_geometry(s->bs, &nb_sectors);
s->nb_sectors = nb_sectors; s->nb_sectors = nb_sectors;

1
hw/scsi-disk.c
View File

@ -1175,6 +1175,7 @@ static void scsi_destroy(SCSIDevice *dev)
static void scsi_cd_change_media_cb(void *opaque, bool load) static void scsi_cd_change_media_cb(void *opaque, bool load)
{ {
((SCSIDiskState *)opaque)->tray_open = !load;
} }
static bool scsi_cd_is_tray_open(void *opaque) static bool scsi_cd_is_tray_open(void *opaque)