Patchwork [v3,27/27] ide/atapi scsi-disk: Make monitor eject -f, then change work

login
register
mail settings
Submitter Markus Armbruster
Date Sept. 6, 2011, 4:59 p.m.
Message ID <1315328340-6192-28-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/113621/
State New
Headers show

Comments

Markus Armbruster - Sept. 6, 2011, 4:59 p.m.
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>
---
 blockdev.c     |    3 ++-
 hw/ide/core.c  |    1 +
 hw/scsi-disk.c |    1 +
 3 files changed, 4 insertions(+), 1 deletions(-)
Paolo Bonzini - Sept. 7, 2011, 7:09 a.m.
On 09/06/2011 06:59 PM, Markus Armbruster wrote:
> 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>
> ---
>   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 154cc84..0827bf7 100644
> --- a/blockdev.c
> +++ b/blockdev.c
> @@ -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));
>           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));
>           return -1;
>       }
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index bc83c46..db144aa 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -789,6 +789,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 f5f1d82..4a60820 100644
> --- a/hw/scsi-disk.c
> +++ b/hw/scsi-disk.c
> @@ -1175,6 +1175,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_tray_open(void *opaque)

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Patch

diff --git a/blockdev.c b/blockdev.c
index 154cc84..0827bf7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -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));
         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));
         return -1;
     }
diff --git a/hw/ide/core.c b/hw/ide/core.c
index bc83c46..db144aa 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -789,6 +789,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 f5f1d82..4a60820 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1175,6 +1175,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_tray_open(void *opaque)