Patchwork [v2] qemu-img: Fix qemu-img can't create qcow image based on read-only image

login
register
mail settings
Submitter Sheng Yang
Date Jan. 29, 2010, 2:15 a.m.
Message ID <1264731306-14187-1-git-send-email-sheng@linux.intel.com>
Download mbox | patch
Permalink /patch/43887/
State New
Headers show

Comments

Sheng Yang - Jan. 29, 2010, 2:15 a.m.
Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
file for read-write" result in read-only image can't be used as backed
image in qemu-img.

Cc: Naphtali Sprei <nsprei@redhat.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
 qemu-img.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
Kevin Wolf - Jan. 29, 2010, 7:23 a.m.
Am 29.01.2010 03:15, schrieb Sheng Yang:
> Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
> file for read-write" result in read-only image can't be used as backed
> image in qemu-img.
> 
> Cc: Naphtali Sprei <nsprei@redhat.com>
> Signed-off-by: Sheng Yang <sheng@linux.intel.com>

Acked-by: Kevin Wolf <kwolf@redhat.com>
Naphtali Sprei - Jan. 31, 2010, 10:24 a.m.
Sheng Yang wrote:
> Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
> file for read-write" result in read-only image can't be used as backed
> image in qemu-img.
> 
> Cc: Naphtali Sprei <nsprei@redhat.com>
> Signed-off-by: Sheng Yang <sheng@linux.intel.com>

Acked-by: Naphtali Sprei <nsprei@redhat.com>

Unfortunately, I see there are still problems with using the resulting images.
Investigating it, will send patches.

  Naphtali
Anthony Liguori - Feb. 10, 2010, 6:31 p.m.
On 01/28/2010 08:15 PM, Sheng Yang wrote:
> Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
> file for read-write" result in read-only image can't be used as backed
> image in qemu-img.
>
> Cc: Naphtali Sprei<nsprei@redhat.com>
> Signed-off-by: Sheng Yang<sheng@linux.intel.com>
>    

Applied.  Thanks.

Regards,

Anthony Liguori
> ---
>   qemu-img.c |   15 ++++++++++-----
>   1 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index 3cea8ce..ac4d15e 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -188,11 +188,13 @@ static int read_password(char *buf, int buf_size)
>   #endif
>
>   static BlockDriverState *bdrv_new_open(const char *filename,
> -                                       const char *fmt)
> +                                       const char *fmt,
> +                                       int readonly)
>   {
>       BlockDriverState *bs;
>       BlockDriver *drv;
>       char password[256];
> +    int flags = BRDV_O_FLAGS;
>
>       bs = bdrv_new("");
>       if (!bs)
> @@ -204,7 +206,10 @@ static BlockDriverState *bdrv_new_open(const char *filename,
>       } else {
>           drv = NULL;
>       }
> -    if (bdrv_open2(bs, filename, BRDV_O_FLAGS | BDRV_O_RDWR, drv)<  0) {
> +    if (!readonly) {
> +        flags |= BDRV_O_RDWR;
> +    }
> +    if (bdrv_open2(bs, filename, flags, drv)<  0) {
>           error("Could not open '%s'", filename);
>       }
>       if (bdrv_is_encrypted(bs)) {
> @@ -343,7 +348,7 @@ static int img_create(int argc, char **argv)
>                   }
>               }
>
> -            bs = bdrv_new_open(backing_file->value.s, fmt);
> +            bs = bdrv_new_open(backing_file->value.s, fmt, 1);
>               bdrv_get_geometry(bs,&size);
>               size *= 512;
>               bdrv_delete(bs);
> @@ -627,7 +632,7 @@ static int img_convert(int argc, char **argv)
>
>       total_sectors = 0;
>       for (bs_i = 0; bs_i<  bs_n; bs_i++) {
> -        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt);
> +        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, 1);
>           if (!bs[bs_i])
>               error("Could not open '%s'", argv[optind + bs_i]);
>           bdrv_get_geometry(bs[bs_i],&bs_sectors);
> @@ -685,7 +690,7 @@ static int img_convert(int argc, char **argv)
>           }
>       }
>
> -    out_bs = bdrv_new_open(out_filename, out_fmt);
> +    out_bs = bdrv_new_open(out_filename, out_fmt, 0);
>
>       bs_i = 0;
>       bs_offset = 0;
>
Naphtali Sprei - Feb. 11, 2010, 5:21 p.m.
Anthony Liguori wrote:
> On 01/28/2010 08:15 PM, Sheng Yang wrote:
>> Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
>> file for read-write" result in read-only image can't be used as backed
>> image in qemu-img.
>>
>> Cc: Naphtali Sprei<nsprei@redhat.com>
>> Signed-off-by: Sheng Yang<sheng@linux.intel.com>
>>    
> 
> Applied.  Thanks.

I've sent a patch that includes this patch, too ( http://lists.gnu.org/archive/html/qemu-devel/2010-02/msg00578.html )
Should I rebase my patch ?

  Naphtali


> 
> Regards,
> 
> Anthony Liguori
Anthony Liguori - Feb. 11, 2010, 5:24 p.m.
On 02/11/2010 11:21 AM, Naphtali Sprei wrote:
> Anthony Liguori wrote:
>    
>> On 01/28/2010 08:15 PM, Sheng Yang wrote:
>>      
>>> Commit 03cbdac7 "Disable fall-back to read-only when cannot open drive's
>>> file for read-write" result in read-only image can't be used as backed
>>> image in qemu-img.
>>>
>>> Cc: Naphtali Sprei<nsprei@redhat.com>
>>> Signed-off-by: Sheng Yang<sheng@linux.intel.com>
>>>
>>>        
>> Applied.  Thanks.
>>      
> I've sent a patch that includes this patch, too ( http://lists.gnu.org/archive/html/qemu-devel/2010-02/msg00578.html )
> Should I rebase my patch ?
>    

Yes.

Regards,

Anthony Liguori

>    Naphtali
>
>
>    
>> Regards,
>>
>> Anthony Liguori
>>      
>
>

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 3cea8ce..ac4d15e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -188,11 +188,13 @@  static int read_password(char *buf, int buf_size)
 #endif
 
 static BlockDriverState *bdrv_new_open(const char *filename,
-                                       const char *fmt)
+                                       const char *fmt,
+                                       int readonly)
 {
     BlockDriverState *bs;
     BlockDriver *drv;
     char password[256];
+    int flags = BRDV_O_FLAGS;
 
     bs = bdrv_new("");
     if (!bs)
@@ -204,7 +206,10 @@  static BlockDriverState *bdrv_new_open(const char *filename,
     } else {
         drv = NULL;
     }
-    if (bdrv_open2(bs, filename, BRDV_O_FLAGS | BDRV_O_RDWR, drv) < 0) {
+    if (!readonly) {
+        flags |= BDRV_O_RDWR;
+    }
+    if (bdrv_open2(bs, filename, flags, drv) < 0) {
         error("Could not open '%s'", filename);
     }
     if (bdrv_is_encrypted(bs)) {
@@ -343,7 +348,7 @@  static int img_create(int argc, char **argv)
                 }
             }
 
-            bs = bdrv_new_open(backing_file->value.s, fmt);
+            bs = bdrv_new_open(backing_file->value.s, fmt, 1);
             bdrv_get_geometry(bs, &size);
             size *= 512;
             bdrv_delete(bs);
@@ -627,7 +632,7 @@  static int img_convert(int argc, char **argv)
 
     total_sectors = 0;
     for (bs_i = 0; bs_i < bs_n; bs_i++) {
-        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt);
+        bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, 1);
         if (!bs[bs_i])
             error("Could not open '%s'", argv[optind + bs_i]);
         bdrv_get_geometry(bs[bs_i], &bs_sectors);
@@ -685,7 +690,7 @@  static int img_convert(int argc, char **argv)
         }
     }
 
-    out_bs = bdrv_new_open(out_filename, out_fmt);
+    out_bs = bdrv_new_open(out_filename, out_fmt, 0);
 
     bs_i = 0;
     bs_offset = 0;