From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfHLu-0005GX-Kp for qemu-devel@nongnu.org; Wed, 10 Feb 2010 13:31:54 -0500 Received: from [199.232.76.173] (port=49499 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfHLu-0005GM-AV for qemu-devel@nongnu.org; Wed, 10 Feb 2010 13:31:54 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfHLs-00017u-JX for qemu-devel@nongnu.org; Wed, 10 Feb 2010 13:31:54 -0500 Received: from mail-gx0-f223.google.com ([209.85.217.223]:46358) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfHLs-00017q-BB for qemu-devel@nongnu.org; Wed, 10 Feb 2010 13:31:52 -0500 Received: by gxk23 with SMTP id 23so327577gxk.2 for ; Wed, 10 Feb 2010 10:31:51 -0800 (PST) Message-ID: <4B72FB93.6060309@codemonkey.ws> Date: Wed, 10 Feb 2010 12:31:47 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2] qemu-img: Fix qemu-img can't create qcow image based on read-only image References: <1264731306-14187-1-git-send-email-sheng@linux.intel.com> In-Reply-To: <1264731306-14187-1-git-send-email-sheng@linux.intel.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sheng Yang Cc: Kevin Wolf , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Naphtali Sprei 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 > Signed-off-by: Sheng Yang > 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; >