[Qemu-devel] [PATCH 1/2] read-only: minor cleanup

[Qemu-devel] [PATCH 1/2] read-only: minor cleanup

[Naphtali Sprei]

Really use read-only flags for opening the file when asked for read-only

Signed-off-by: Naphtali Sprei <nsprei@redhat.com>
---
 qemu-nbd.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index eac0c21..d803bfd 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -258,6 +258,7 @@ int main(int argc, char **argv)
             break;
         case 'r':
             readonly = true;
+            flags &= BDRV_O_RDWR;
             break;
         case 'P':
             partition = strtol(optarg, &end, 0);
-- 
1.6.3.3

[Qemu-devel] [PATCH 2/2] read-only: Another minor cleanup

[Naphtali Sprei]

Don't rely on CDROM hint for read_only attribute

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

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 8f7ffc1..5cd6ae6 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -612,8 +612,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;
-- 
1.6.3.3

[Qemu-devel] Re: [PATCH 1/2] read-only: minor cleanup

[Paolo Bonzini]

On 03/11/2010 03:44 PM, Naphtali Sprei wrote:
>           case 'r':
>               readonly = true;
> +            flags &= BDRV_O_RDWR;

I'm pretty sure a ~ is missing there. :-)

Paolo