From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdtVW-0006K1-Ee for qemu-devel@nongnu.org; Tue, 05 Nov 2013 22:10:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdtVN-0003K6-RM for qemu-devel@nongnu.org; Tue, 05 Nov 2013 22:10:14 -0500 Received: from mail-ob0-x235.google.com ([2607:f8b0:4003:c01::235]:45992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdtVN-0003JY-NB for qemu-devel@nongnu.org; Tue, 05 Nov 2013 22:10:05 -0500 Received: by mail-ob0-f181.google.com with SMTP id wp4so9357845obc.26 for ; Tue, 05 Nov 2013 19:10:05 -0800 (PST) From: Xu Wang Date: Tue, 5 Nov 2013 22:09:19 -0500 Message-Id: <1383707361-19580-4-git-send-email-gesaint@linux.vnet.ibm.com> In-Reply-To: <1383707361-19580-1-git-send-email-gesaint@linux.vnet.ibm.com> References: <1383707361-19580-1-git-send-email-gesaint@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V6 3/5] 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 3443117..8423e80 100644 --- a/block.c +++ b/block.c @@ -4670,15 +4670,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_new_chain_okay(filename, backing_file->value.s, + backing_fmt->value.s)) { + error_report("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