From patchwork Fri Dec 17 17:44:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 75981 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 AF3B51007D3 for ; Sat, 18 Dec 2010 08:04:50 +1100 (EST) Received: from localhost ([127.0.0.1]:45755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTegh-0003ob-Do for incoming@patchwork.ozlabs.org; Fri, 17 Dec 2010 13:05:51 -0500 Received: from [140.186.70.92] (port=52110 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTeN8-0001ee-Sh for qemu-devel@nongnu.org; Fri, 17 Dec 2010 12:46:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTeME-00036k-GC for qemu-devel@nongnu.org; Fri, 17 Dec 2010 12:45:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:51181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTeME-00036Y-0R for qemu-devel@nongnu.org; Fri, 17 Dec 2010 12:44:42 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oBHHiaZd022706 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 17 Dec 2010 12:44:36 -0500 Received: from dhcp-5-188.str.redhat.com (vpn1-5-143.ams2.redhat.com [10.36.5.143]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oBHHhdMe031047; Fri, 17 Dec 2010 12:44:34 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 17 Dec 2010 18:44:36 +0100 Message-Id: <1292607893-13461-22-git-send-email-kwolf@redhat.com> In-Reply-To: <1292607893-13461-1-git-send-email-kwolf@redhat.com> References: <1292607893-13461-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 21/38] Prevent creating an image with the same filename as backing file 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 From: Jes Sorensen Signed-off-by: Jes Sorensen Signed-off-by: Kevin Wolf --- block.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index a48b30c..0c14eee 100644 --- a/block.c +++ b/block.c @@ -2764,7 +2764,7 @@ int bdrv_img_create(const char *filename, const char *fmt, char *options, uint64_t img_size, int flags) { QEMUOptionParameter *param = NULL, *create_options = NULL; - QEMUOptionParameter *backing_fmt; + QEMUOptionParameter *backing_fmt, *backing_file; BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; int ret = 0; @@ -2823,6 +2823,16 @@ int bdrv_img_create(const char *filename, const char *fmt, } } + backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); + if (backing_file && backing_file->value.s) { + if (!strcmp(filename, backing_file->value.s)) { + error_report("Error: Trying to create an image with the " + "same filename as the backing file"); + ret = -1; + goto out; + } + } + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_fmt && backing_fmt->value.s) { if (!bdrv_find_format(backing_fmt->value.s)) { @@ -2836,9 +2846,6 @@ int bdrv_img_create(const char *filename, const char *fmt, // The size for the image must always be specified, with one exception: // If we are using a backing file, we can obtain the size from there if (get_option_parameter(param, BLOCK_OPT_SIZE)->value.n == -1) { - QEMUOptionParameter *backing_file = - get_option_parameter(param, BLOCK_OPT_BACKING_FILE); - if (backing_file && backing_file->value.s) { uint64_t size; const char *fmt = NULL;