Received: from eggs.gnu.org ([2001:4830:134:3::10]:53539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgQlu-0006zu-99 for qemu-devel@nongnu.org; Tue, 12 Nov 2013 22:05:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgQlj-0002Mw-N7 for qemu-devel@nongnu.org; Tue, 12 Nov 2013 22:05:38 -0500 Received: from mail-oa0-x22e.google.com ([2607:f8b0:4003:c02::22e]:62558) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgQNM-0007Mv-Ng for qemu-devel@nongnu.org; Tue, 12 Nov 2013 21:40:16 -0500 Received: by mail-oa0-f46.google.com with SMTP id m1so4978104oag.33 for ; Tue, 12 Nov 2013 18:40:16 -0800 (PST) From: Xu Wang Date: Tue, 12 Nov 2013 21:39:38 -0500 Message-Id: <1384310380-9805-3-git-send-email-gesaint@linux.vnet.ibm.com> In-Reply-To: <1384310380-9805-1-git-send-email-gesaint@linux.vnet.ibm.com> References: <1384310380-9805-1-git-send-email-gesaint@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V7 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 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 3c43179..c2ed6ef 100644 --- a/block.c +++ b/block.c @@ -4629,15 +4629,16 @@ 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)) { + error_setg(errp, "bdrv_img_create: loop exists, " + "image create failed"); 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