From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 20 Jul 2011 16:23:43 +0000 (+0200)
Subject: block: Don't let locked flag prevent medium load
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=49aa46bb4b894ff8bdb0339ee2a5dd3fcfe93ecd;p=qemu.git

block: Don't let locked flag prevent medium load

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 <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block.c b/block.c
index 7c25fe4990..8859f9b414 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;
     }