diff options
| -rw-r--r-- | block.c | 20 | ||||
| -rwxr-xr-x | tests/qemu-iotests/110 | 3 | ||||
| -rw-r--r-- | tests/qemu-iotests/110.out | 2 |
3 files changed, 16 insertions, 9 deletions
@@ -337,16 +337,22 @@ char *bdrv_get_full_backing_filename_from_filename(const char *backed, static char *bdrv_make_absolute_filename(BlockDriverState *relative_to, const char *filename, Error **errp) { - char *bs_filename; + char *dir, *full_name; - bdrv_refresh_filename(relative_to); + if (!filename || filename[0] == '\0') { + return NULL; + } else if (path_has_protocol(filename) || path_is_absolute(filename)) { + return g_strdup(filename); + } - bs_filename = relative_to->exact_filename[0] - ? relative_to->exact_filename - : relative_to->filename; + dir = bdrv_dirname(relative_to, errp); + if (!dir) { + return NULL; + } - return bdrv_get_full_backing_filename_from_filename(bs_filename, - filename ?: "", errp); + full_name = g_strconcat(dir, filename, NULL); + g_free(dir); + return full_name; } char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp) diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 index b64b3b215a..3e9d72d302 100755 --- a/tests/qemu-iotests/110 +++ b/tests/qemu-iotests/110 @@ -60,7 +60,8 @@ echo '=== Non-reconstructable filename ===' echo # Across blkdebug without a config file, you cannot reconstruct filenames, so -# qemu is incapable of knowing the directory of the top image +# qemu is incapable of knowing the directory of the top image from the filename +# alone. However, using bdrv_dirname(), it should still work. TEST_IMG="json:{ 'driver': '$IMGFMT', 'file': { diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out index b3584ff87f..5370bc1d26 100644 --- a/tests/qemu-iotests/110.out +++ b/tests/qemu-iotests/110.out @@ -14,7 +14,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}} file format: IMGFMT virtual size: 64M (67108864 bytes) -backing file: t.IMGFMT.base (cannot determine actual path) +backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) === Backing name is always relative to the backed image === |