From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAe-0000Ms-NA for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QocAc-0007V6-RP for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QocAc-0007Ta-IX for qemu-devel@nongnu.org; Wed, 03 Aug 2011 10:11:38 -0400 From: Kevin Wolf Date: Wed, 3 Aug 2011 16:14:01 +0200 Message-Id: <1312380864-15605-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1312380864-15605-1-git-send-email-kwolf@redhat.com> References: <1312380864-15605-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 06/29] block: Don't let locked flag prevent medium load List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster 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 Signed-off-by: Kevin Wolf --- block.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 7c25fe4..8859f9b 100644 --- a/block.c +++ b/block.c @@ -2771,7 +2771,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.6