From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZk-0003jk-5V for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZZd-0008Ob-Nr for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:40 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:55532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZZc-0008Nq-3J for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:24:36 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:23:43 +0200 Message-Id: <1311179069-27882-10-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 09/55] block: Don't let locked flag prevent medium load 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 Commit aea2a33c made bdrv_eject() obey the locked flag. Correct for medium eject (eject_flag set), incorrect for medium load (eject_flag clear). See MMC-5 Table 341 "Actions for Lock/Unlock/Eject". Signed-off-by: Markus Armbruster --- block.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 594bcab..6727274 100644 --- a/block.c +++ b/block.c @@ -2769,7 +2769,7 @@ int bdrv_eject(BlockDriverState *bs, int eject_flag) { BlockDriver *drv = bs->drv; - if (bs->locked) { + if (eject_flag && bs->locked) { return -EBUSY; } -- 1.7.2.3