From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1BBa-00039v-TK for qemu-devel@nongnu.org; Mon, 22 Jul 2013 04:09:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V1BBY-0002Mz-1P for qemu-devel@nongnu.org; Mon, 22 Jul 2013 04:09:38 -0400 Received: from mail-pb0-x22d.google.com ([2607:f8b0:400e:c01::22d]:44292) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V1BBX-0002Mo-S1 for qemu-devel@nongnu.org; Mon, 22 Jul 2013 04:09:35 -0400 Received: by mail-pb0-f45.google.com with SMTP id mc8so6762789pbc.4 for ; Mon, 22 Jul 2013 01:09:35 -0700 (PDT) From: Xu Wang Date: Mon, 22 Jul 2013 04:05:47 -0400 Message-Id: <1374480349-11412-4-git-send-email-cngesaint@gmail.com> In-Reply-To: <1374480349-11412-1-git-send-email-cngesaint@gmail.com> References: <1374480349-11412-1-git-send-email-cngesaint@gmail.com> Subject: [Qemu-devel] [PATCH V4 3/5] block: 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, stefanha@gmail.com, Xu Wang , famz@redhat.com, wdongxu@linux.vnet.ibm.com Backing file loop should be checked before qemu-img create command execution. If loop was found, qemu-img create should be stopped and an error was printed. Signed-off-by: Xu Wang --- block.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block.c b/block.c index 3e23b67..9daf63c 100644 --- a/block.c +++ b/block.c @@ -4735,15 +4735,15 @@ 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_file_loop_check(filename, fmt, + backing_file->value.s, + backing_fmt->value.s)) { + /* There is loop exists in the backing file chain */ 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