Received: from eggs.gnu.org ([2001:4830:134:3::10]:46166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhD2Y-000209-Jd for qemu-devel@nongnu.org; Fri, 15 Nov 2013 01:38:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VhD2Q-00078k-2b for qemu-devel@nongnu.org; Fri, 15 Nov 2013 01:38:02 -0500 Received: from mail-oa0-x22e.google.com ([2607:f8b0:4003:c02::22e]:57247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VhD2P-00078e-UZ for qemu-devel@nongnu.org; Fri, 15 Nov 2013 01:37:54 -0500 Received: by mail-oa0-f46.google.com with SMTP id m1so3498107oag.33 for ; Thu, 14 Nov 2013 22:37:53 -0800 (PST) From: Xu Wang Date: Fri, 15 Nov 2013 01:37:21 -0500 Message-Id: <1384497443-17292-3-git-send-email-gesaint@linux.vnet.ibm.com> In-Reply-To: <1384497443-17292-1-git-send-email-gesaint@linux.vnet.ibm.com> References: <1384497443-17292-1-git-send-email-gesaint@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V8 2/4] block: Add check infinite loop in bdrv_img_create() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, stefanha@gmail.com, Xu Wang , wdongxu@linux.vnet.ibm.com, xiawenc@linux.vnet.ibm.com 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 24202c0..6fbc702 100644 --- a/block.c +++ b/block.c @@ -4627,15 +4627,17 @@ void bdrv_img_create(const char *filename, const char *fmt, } backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE); + backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT); 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"); + if (!bdrv_backing_chain_okay(backing_file->value.s, + backing_fmt->value.s, filename, + &local_err)) { + error_setg(errp, "bdrv_img_create: Image %s create failed. %s", + filename, error_get_pretty(local_err)); 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); if (!backing_drv) { -- 1.8.1.4