From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51946 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PTDK2-0000cp-4X for qemu-devel@nongnu.org; Thu, 16 Dec 2010 07:52:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTDK0-0000CY-GO for qemu-devel@nongnu.org; Thu, 16 Dec 2010 07:52:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTDK0-0000CO-9R for qemu-devel@nongnu.org; Thu, 16 Dec 2010 07:52:36 -0500 From: Jes.Sorensen@redhat.com Date: Thu, 16 Dec 2010 13:52:17 +0100 Message-Id: <1292503938-10167-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1292503938-10167-1-git-send-email-Jes.Sorensen@redhat.com> References: <1292503938-10167-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] Prevent creating an image with the same filename as backing file List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: qemu-devel@nongnu.org, armbru@redhat.com, stefanha@linux.vnet.ibm.com From: Jes Sorensen Signed-off-by: Jes Sorensen --- 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; -- 1.7.3.3