[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/5] block: Relative backing file for image creat
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 3/5] block: Relative backing file for image creation |
Date: |
Tue, 4 Nov 2014 15:19:21 +0100 |
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 <address@hidden>
---
block.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index d9440c0..b8fade9 100644
--- a/block.c
+++ b/block.c
@@ -5620,22 +5620,27 @@ 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) {
- error_setg_errno(errp, -ret, "Could not open '%s': %s",
- backing_file,
- error_get_pretty(local_err));
- error_free(local_err);
- local_err = NULL;
goto out;
}
size = bdrv_getlength(bs);
--
1.9.3
- [Qemu-devel] [PATCH v2 0/5] block: Relative backing files, Max Reitz, 2014/11/04
- [Qemu-devel] [PATCH v2 1/5] block: Get full backing filename from string, Max Reitz, 2014/11/04
- [Qemu-devel] [PATCH v2 2/5] block: JSON filenames and relative backing files, Max Reitz, 2014/11/04
- [Qemu-devel] [PATCH v2 5/5] iotests: Add test for relative backing file names, Max Reitz, 2014/11/04
- [Qemu-devel] [PATCH v2 3/5] block: Relative backing file for image creation,
Max Reitz <=
- [Qemu-devel] [PATCH v2 4/5] block/vmdk: Relative backing file for creation, Max Reitz, 2014/11/04
- Re: [Qemu-devel] [PATCH v2 0/5] block: Relative backing files, Max Reitz, 2014/11/21