From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsqBD-00065G-Ly for qemu-devel@nongnu.org; Mon, 24 Nov 2014 04:43:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XsqB7-0007vx-47 for qemu-devel@nongnu.org; Mon, 24 Nov 2014 04:43:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46986) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XsqB6-0007vk-R6 for qemu-devel@nongnu.org; Mon, 24 Nov 2014 04:43:29 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAO9hSYw011785 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 24 Nov 2014 04:43:28 -0500 From: Max Reitz Date: Mon, 24 Nov 2014 10:43:18 +0100 Message-Id: <1416822200-31088-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1416822200-31088-1-git-send-email-mreitz@redhat.com> References: <1416822200-31088-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/5] block: Relative backing file for image creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Relative backing filenames are always relative to the backed image's directory; the same applies to image creation. Therefore, if the backing file has to be opened for determining its size (in case the size has not been explicitly specified) its filename should be interpreted relative to the new image's base directory and not relative to qemu's working directory. Signed-off-by: Max Reitz --- block.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index a0cddcd..ed8e187 100644 --- a/block.c +++ b/block.c @@ -5633,16 +5633,26 @@ void bdrv_img_create(const char *filename, const char *fmt, if (size == -1) { if (backing_file) { BlockDriverState *bs; + char *full_backing = g_new0(char, PATH_MAX); int64_t size; int back_flags; + bdrv_get_full_backing_filename_from_filename(filename, backing_file, + full_backing, PATH_MAX, + &local_err); + if (local_err) { + g_free(full_backing); + goto out; + } + /* backing files always opened read-only */ back_flags = flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING); bs = NULL; - ret = bdrv_open(&bs, backing_file, NULL, NULL, back_flags, + ret = bdrv_open(&bs, full_backing, NULL, NULL, back_flags, backing_drv, &local_err); + g_free(full_backing); if (ret < 0) { goto out; } -- 1.9.3