From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NdEDg-0003tb-GP for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:46:56 -0500 Received: from [199.232.76.173] (port=44686 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NdEDg-0003tT-5Z for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:46:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NdEDd-0004hY-AU for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:46:55 -0500 Received: from mga07.intel.com ([143.182.124.22]:18558 helo=azsmga101.ch.intel.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NdEDc-0004hC-GI for qemu-devel@nongnu.org; Thu, 04 Feb 2010 21:46:52 -0500 From: Sheng Yang Subject: Re: [Qemu-devel] [PATCH v2 resend 2/4] qemu-img: Fix qemu-img can't create qcow image based on read-only image Date: Fri, 5 Feb 2010 10:45:19 +0800 References: <1265321069-4105-1-git-send-email-nsprei@redhat.com> <1265321069-4105-2-git-send-email-nsprei@redhat.com> <1265321069-4105-3-git-send-email-nsprei@redhat.com> In-Reply-To: <1265321069-4105-3-git-send-email-nsprei@redhat.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201002051045.19618.sheng@linux.intel.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Naphtali Sprei On Friday 05 February 2010 06:04:27 Naphtali Sprei wrote: > Open image file read-only where possible > Patch originally written by Sheng Yang > Signed-off-by: Sheng Yang > Signed-off-by: Naphtali Sprei -- regards Yang, Sheng > --- > qemu-img.c | 15 ++++++++++----- > 1 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index cbba4fc..b0ac9eb 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; >