From patchwork Tue Nov 26 06:38:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xu Wang X-Patchwork-Id: 294216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CB1582C0097 for ; Tue, 26 Nov 2013 17:39:55 +1100 (EST) Received: from localhost ([::1]:56703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlCJN-0004Uy-9T for incoming@patchwork.ozlabs.org; Tue, 26 Nov 2013 01:39:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlCIh-0004Dz-RE for qemu-devel@nongnu.org; Tue, 26 Nov 2013 01:39:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlCIY-0000lY-Oj for qemu-devel@nongnu.org; Tue, 26 Nov 2013 01:39:11 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:60053) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlCIY-0000lC-1n for qemu-devel@nongnu.org; Tue, 26 Nov 2013 01:39:02 -0500 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 26 Nov 2013 16:38:55 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 26 Nov 2013 16:38:54 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 408072BB0054 for ; Tue, 26 Nov 2013 17:38:54 +1100 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAQ6cgnd39977202 for ; Tue, 26 Nov 2013 17:38:42 +1100 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAQ6crwS017855 for ; Tue, 26 Nov 2013 17:38:54 +1100 Received: from localhost.localdomain ([9.110.190.188]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rAQ6cbbV017527; Tue, 26 Nov 2013 17:38:52 +1100 From: Xu Wang To: qemu-devel@nongnu.org Date: Tue, 26 Nov 2013 01:38:31 -0500 Message-Id: <1385447913-19004-3-git-send-email-gesaint@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1385447913-19004-1-git-send-email-gesaint@linux.vnet.ibm.com> References: <1385447913-19004-1-git-send-email-gesaint@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13112606-1618-0000-0000-0000050A02A0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 202.81.31.143 Cc: kwolf@redhat.com, famz@redhat.com, stefanha@gmail.com, wdongxu@linux.vnet.ibm.com, Xu Wang Subject: [Qemu-devel] [PATCH V9 2/4] block: Add check infinite loop in bdrv_img_create() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Backing file loop should be checked before qemu-img create command execution. If loop is found, qemu-img create should be stopped and an error printed. Signed-off-by: Xu Wang --- block.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index 7016ce8..b8cea1c 100644 --- a/block.c +++ b/block.c @@ -4633,14 +4633,6 @@ void 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_setg(errp, "Error: Trying to create an image with the " - "same filename as the backing file"); - goto out; - } - } - backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); if (backing_fmt && backing_fmt->value.s) { backing_drv = bdrv_find_format(backing_fmt->value.s); @@ -4651,6 +4643,16 @@ void bdrv_img_create(const char *filename, const char *fmt, } } + if (backing_file && backing_file->value.s) { + if (!bdrv_backing_chain_okay(backing_file->value.s, + backing_drv, filename, + &local_err)) { + error_setg(errp, "Failed to create image: %s", + error_get_pretty(local_err)); + goto out; + } + } + // 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 size = get_option_parameter(param, BLOCK_OPT_SIZE);