From patchwork Wed Aug 3 13:08:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 108173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7A5C5B6FF5 for ; Wed, 3 Aug 2011 23:15:09 +1000 (EST) Received: from localhost ([::1]:42362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHt-0005Ot-Gm for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 09:15:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHh-0005N9-KI for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobHf-0002WF-FY for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:53 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:36902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobHf-0002Vq-Ao for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:14:51 -0400 Received: from blackfin.pond.sub.org (p5B32D904.dip.t-dialin.net [91.50.217.4]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 9CEF1A2C8F; Wed, 3 Aug 2011 15:14:50 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 18AA060069; Wed, 3 Aug 2011 15:08:25 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 15:08:03 +0200 Message-Id: <1312376904-16115-25-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Subject: [Qemu-devel] [PATCH v2 24/45] scsi-disk: Avoid physical/virtual tray state mismatch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Hannes Reinecke --- 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 19a1843..f223de6 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1205,6 +1205,9 @@ static void scsi_destroy(SCSIDevice *dev) SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); scsi_device_purge_requests(&s->qdev); + if (s->qdev.type == TYPE_ROM) { + bdrv_lock_medium(s->qdev.conf.bs, 0); + } blockdev_mark_auto_del(s->qdev.conf.bs); } @@ -1265,6 +1268,10 @@ static int scsi_initfn(SCSIDevice *dev, uint8_t scsi_type) s->qdev.type = scsi_type; qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); bdrv_set_removable(s->bs, scsi_type == TYPE_ROM); + if (scsi_type == TYPE_ROM) { + 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; }