From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhM-00061g-2g 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 1QjZhD-0001MS-8E for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:34 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39218) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhB-0001Ku-Kt for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:26 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:24:09 +0200 Message-Id: <1311179069-27882-36-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 35/55] scsi-disk: Avoid physical/virtual tray state mismatch 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 When scsi-cd is backed by a physical drive, we want the physical tray match the virtual one. To that end, we call bdrv_eject() on guest's load/eject, and bdrv_lock_medium() on guest's prevent/allow removal. But we don't set the initial state on device model init. Fix that. While there, also unlock on device model exit. Signed-off-by: Markus Armbruster --- hw/scsi-disk.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index b9de4df..553d8c6 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1270,6 +1270,9 @@ static void scsi_destroy(SCSIDevice *dev) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); scsi_device_purge_requests(&s->qdev); + if (s->drive_kind == SCSI_CD) { + bdrv_lock_medium(s->qdev.conf.bs, 0); + } blockdev_mark_auto_del(s->qdev.conf.bs); } @@ -1332,6 +1335,10 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind kind) s->qdev.type = TYPE_DISK; qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); bdrv_set_removable(s->bs, kind == SCSI_CD); + if (kind == SCSI_CD) { + bdrv_lock_medium(s->bs, s->tray_locked); + bdrv_eject(s->bs, s->tray_open); + } add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, ",0"); return 0; } -- 1.7.2.3