[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/25] block: Add bdrv_make_absolute_filename()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 08/25] block: Add bdrv_make_absolute_filename() |
Date: |
Mon, 16 Jan 2017 21:49:04 +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>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 7e60bb090b..4ad561810f 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.11.0
- [Qemu-devel] [PATCH v4 02/25] block: Use children list in bdrv_refresh_filename, (continued)
- [Qemu-devel] [PATCH v4 02/25] block: Use children list in bdrv_refresh_filename, Max Reitz, 2017/01/11
- [Qemu-devel] [PATCH v4 03/25] block: Add BDS.backing_overridden, Max Reitz, 2017/01/11
- [Qemu-devel] [PATCH v4 04/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2017/01/11
- [Qemu-devel] [PATCH v4 05/25] block: Make path_combine() return the path, Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 07/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 08/25] block: Add bdrv_make_absolute_filename(),
Max Reitz <=
- [Qemu-devel] [PATCH v4 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 10/25] block: Add bdrv_dirname(), Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 11/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 12/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2017/01/16
- [Qemu-devel] [PATCH v4 13/25] block/nbd: Implement bdrv_dirname(), Max Reitz, 2017/01/16