[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename()
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename() |
Date: |
Sun, 27 Nov 2016 02:56:06 +0100 |
This is a general function for making a filename that is relative to a
certain BDS absolute.
It calls bdrv_get_full_backing_filename_from_filename() for now, but
that will be changed in a follow-up patch.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index d6b3a5a..a384e28 100644
--- a/block.c
+++ b/block.c
@@ -220,15 +220,22 @@ char *bdrv_get_full_backing_filename_from_filename(const
char *backed,
}
}
-char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp)
+static char *bdrv_make_absolute_filename(BlockDriverState *relative_to,
+ const char *filename, Error **errp)
{
- char *backed = bs->exact_filename[0] ? bs->exact_filename : bs->filename;
+ char *bs_filename = relative_to->exact_filename[0]
+ ? relative_to->exact_filename
+ : relative_to->filename;
- return bdrv_get_full_backing_filename_from_filename(backed,
- bs->backing_file,
+ return bdrv_get_full_backing_filename_from_filename(bs_filename, filename,
errp);
}
+char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp)
+{
+ return bdrv_make_absolute_filename(bs, bs->backing_file, errp);
+}
+
void bdrv_register(BlockDriver *bdrv)
{
QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list);
--
2.10.2
- [Qemu-block] [PATCH v2 00/24] block: Fix some filename generation issues, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 01/24] block/mirror: Small absolute-paths simplification, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_filename, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 03/24] block: Add BDS.backing_overridden, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 05/24] block: Make path_combine() return the path, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 04/24] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 06/24] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 07/24] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename(),
Max Reitz <=
- [Qemu-block] [PATCH v2 09/24] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 10/24] block: Add bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 12/24] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 13/24] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 14/24] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 15/24] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 16/24] block: Add 'base-directory' BDS option, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 17/24] iotests: Add quorum case to test 110, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 18/24] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/26