From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhM-00061q-MK for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhA-0001KK-LX for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:35 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39187) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhA-0001K2-8y for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:24 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:24:29 +0200 Message-Id: <1311179069-27882-56-git-send-email-armbru@redhat.com> In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com 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 --- 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