From: Naphtali Sprei <nsprei@redhat.com>
Date: Thu, 11 Mar 2010 14:44:34 +0000 (+0200)
Subject: read-only: Another minor cleanup
X-Git-Tag: v0.13.0-rc0~1051
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0056dcc1146545e7c814db83b7b7b62e0c93ac68;p=thirdparty%2Fqemu.git

read-only: Another minor cleanup

Don't rely on CDROM hint for read_only attribute

Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e64fbf11ddb..1fbd4ee1bb5 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -613,8 +613,7 @@ static int scsi_disk_emulate_mode_sense(SCSIRequest *req, uint8_t *outbuf)
 
     p[1] = 0; /* Default media type.  */
     p[3] = 0; /* Block descriptor length.  */
-    if (bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM ||
-        bdrv_is_read_only(s->bs)) {
+    if (bdrv_is_read_only(s->bs)) {
         p[2] = 0x80; /* Readonly.  */
     }
     p += 4;