diff mbox

[1/2] atapi: Drives can be locked without media present

Message ID 2db4951250c8473b5d0b78d24353c45c32b5aa8a.1302344671.git.amit.shah@redhat.com
State New
Headers show

Commit Message

Amit Shah April 9, 2011, 10:24 a.m. UTC 
Drivers are free to lock drives without any media present.  Such a
condition should not result in an error condition.

See Table 341 in MMC-5 spec for details.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/ide/core.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

Comments

Kevin Wolf April 11, 2011, 2:54 p.m. UTC | #1 
Am 09.04.2011 12:24, schrieb Amit Shah:
> Drivers are free to lock drives without any media present.  Such a
> condition should not result in an error condition.
> 
> See Table 341 in MMC-5 spec for details.
> 
> Signed-off-by: Amit Shah <amit.shah@redhat.com>

Thanks, applied both to the block branch.

Kevin
diff mbox

Patch

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 7a407fc..8958ff2 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1390,13 +1390,8 @@  static void ide_atapi_cmd(IDEState *s)
         ide_atapi_cmd_reply(s, 18, max_len);
         break;
     case GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
-        if (bdrv_is_inserted(s->bs)) {
-            bdrv_set_locked(s->bs, packet[4] & 1);
-            ide_atapi_cmd_ok(s);
-        } else {
-            ide_atapi_cmd_error(s, SENSE_NOT_READY,
-                                ASC_MEDIUM_NOT_PRESENT);
-        }
+        bdrv_set_locked(s->bs, packet[4] & 1);
+        ide_atapi_cmd_ok(s);
         break;
     case GPCMD_READ_10:
     case GPCMD_READ_12: