From 16bf98cd3b44b37b63bcec458771db8711b5d068 Mon Sep 17 00:00:00 2001
From: Naphtali Sprei <nsprei@redhat.com>
Date: Thu, 15 Apr 2010 11:56:46 -0300
Subject: [PATCH 10/12] read-only: don't rely on CDROM hint for read_only attribute

RH-Author: Naphtali Sprei <nsprei@redhat.com>
Message-id: <1271332608-5243-10-git-send-email-nsprei@redhat.com>
Patchwork-id: 8657
O-Subject: [RHEL 5.6 kvm PATCH v4 09/11] read-only: don't rely on CDROM hint for
	read_only attribute
Bugzilla: 510630
RH-Acked-by: Christoph Hellwig <chellwig@redhat.com>
RH-Acked-by: Juan Quintela <quintela@redhat.com>
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

no upstream related commit

Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
---
 qemu/hw/scsi-disk.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/scsi-disk.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/scsi-disk.c b/qemu/hw/scsi-disk.c
index f3f07ac..3930ab3 100644
--- a/qemu/hw/scsi-disk.c
+++ b/qemu/hw/scsi-disk.c
@@ -626,8 +626,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
             memset(p, 0, 4);
             outbuf[1] = 0; /* Default media type.  */
             outbuf[3] = 0; /* Block descriptor length.  */
-            if (bdrv_get_type_hint(s->bdrv) == BDRV_TYPE_CDROM ||
-                bdrv_is_read_only(s->bdrv)) {
+            if (bdrv_is_read_only(s->bdrv)) {
                 outbuf[2] = 0x80; /* Readonly.  */
             }
             p += 4;
-- 
1.7.0.3