From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86Cg-000375-8E for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y86Ca-0007V7-3h for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y86CZ-0007V2-TY for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:52:04 -0500 From: Stefan Hajnoczi Date: Mon, 5 Jan 2015 11:51:27 +0000 Message-Id: <1420458696-1885-11-git-send-email-stefanha@redhat.com> In-Reply-To: <1420458696-1885-1-git-send-email-stefanha@redhat.com> References: <1420458696-1885-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 10/19] 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 , Peter Maydell , Max Reitz From: 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 Signed-off-by: Kevin Wolf --- block/vmdk.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/block/vmdk.c b/block/vmdk.c index bfff900..52cb888 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1891,8 +1891,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; } -- 2.1.0