From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nd9oe-0006Pp-P4 for qemu-devel@nongnu.org; Thu, 04 Feb 2010 17:04:48 -0500 Received: from [199.232.76.173] (port=46748 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd9od-0006Ov-GB for qemu-devel@nongnu.org; Thu, 04 Feb 2010 17:04:47 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nd9oZ-0000oO-QU for qemu-devel@nongnu.org; Thu, 04 Feb 2010 17:04:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31549) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nd9oZ-0000oA-Ce for qemu-devel@nongnu.org; Thu, 04 Feb 2010 17:04:43 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14M4doD003515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Feb 2010 17:04:39 -0500 From: Naphtali Sprei Date: Fri, 5 Feb 2010 00:04:27 +0200 Message-Id: <1265321069-4105-3-git-send-email-nsprei@redhat.com> In-Reply-To: <1265321069-4105-2-git-send-email-nsprei@redhat.com> References: <1265321069-4105-1-git-send-email-nsprei@redhat.com> <1265321069-4105-2-git-send-email-nsprei@redhat.com> Subject: [Qemu-devel] [PATCH v2 resend 2/4] qemu-img: Fix qemu-img can't create qcow image based on read-only image List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Naphtali Sprei Open image file read-only where possible Patch originally written by Sheng Yang Signed-off-by: Naphtali Sprei --- 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; -- 1.6.3.3