From patchwork Thu Feb 4 13:43:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naphtali Sprei X-Patchwork-Id: 44492 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4B001B7D4F for ; Fri, 5 Feb 2010 01:15:32 +1100 (EST) Received: from localhost ([127.0.0.1]:51234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd28J-00078X-MX for incoming@patchwork.ozlabs.org; Thu, 04 Feb 2010 08:52:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nd20I-00056a-LP for qemu-devel@nongnu.org; Thu, 04 Feb 2010 08:44:18 -0500 Received: from [199.232.76.173] (port=49091 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nd20H-00055o-P9 for qemu-devel@nongnu.org; Thu, 04 Feb 2010 08:44:17 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nd20G-0001H5-1r for qemu-devel@nongnu.org; Thu, 04 Feb 2010 08:44:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10004) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nd20F-0001Gr-IE for qemu-devel@nongnu.org; Thu, 04 Feb 2010 08:44:15 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o14DiEfE015583 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Feb 2010 08:44:14 -0500 Received: from localhost.localdomain (dhcp-0-60.tlv.redhat.com [10.35.0.60]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o14Di5U3004233; Thu, 4 Feb 2010 08:44:12 -0500 From: Naphtali Sprei To: qemu-devel@nongnu.org Date: Thu, 4 Feb 2010 15:43:59 +0200 Message-Id: <1265291041-31100-3-git-send-email-nsprei@redhat.com> In-Reply-To: <1265291041-31100-2-git-send-email-nsprei@redhat.com> References: <1265291041-31100-1-git-send-email-nsprei@redhat.com> <1265291041-31100-2-git-send-email-nsprei@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Naphtali Sprei Subject: [Qemu-devel] [PATCH v2 2/4] qemu-img: Fix qemu-img can't create qcow image based on read-only image X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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;