From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtfKr-0002dP-Ih for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:21:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtfKd-00013b-Hx for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:20:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtfKc-0000zv-KS for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:20:43 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAQGKfdi029440 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 26 Nov 2014 11:20:41 -0500 From: Max Reitz Date: Wed, 26 Nov 2014 17:20:28 +0100 Message-Id: <1417018829-15002-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1417018829-15002-1-git-send-email-mreitz@redhat.com> References: <1417018829-15002-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 5/6] block/vmdk: Relative backing file for creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz When a vmdk image is created with a backing file, it is opened to check whether it is indeed a vmdk file by letting qemu probe it. When doing so, the backing filename is relative to the image's base directory so it should be interpreted accordingly. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Fam Zheng --- block/vmdk.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index 2cbfd3e..aea8f07 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1868,8 +1868,19 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) } if (backing_file) { BlockDriverState *bs = NULL; - ret = bdrv_open(&bs, backing_file, NULL, NULL, BDRV_O_NO_BACKING, NULL, + char *full_backing = g_new0(char, PATH_MAX); + bdrv_get_full_backing_filename_from_filename(filename, backing_file, + full_backing, PATH_MAX, + &local_err); + if (local_err) { + g_free(full_backing); + error_propagate(errp, local_err); + ret = -ENOENT; + goto exit; + } + ret = bdrv_open(&bs, full_backing, NULL, NULL, BDRV_O_NO_BACKING, NULL, errp); + g_free(full_backing); if (ret != 0) { goto exit; } -- 1.9.3