[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 13/31] block: Fix bdrv_find_backing_image()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v11 13/31] block: Fix bdrv_find_backing_image() |
Date: |
Sat, 6 Oct 2018 01:40:05 +0200 |
bdrv_find_backing_image() should use bdrv_get_full_backing_filename() or
bdrv_make_absolute_filename() instead of trying to do what those
functions do by itself.
path_combine_deprecated() can now be dropped, so let's do that.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/block.c b/block.c
index 6a346f6e5e..45acdfa2bb 100644
--- a/block.c
+++ b/block.c
@@ -201,15 +201,6 @@ char *path_combine(const char *base_path, const char
*filename)
return result;
}
-static void path_combine_deprecated(char *dest, int dest_size,
- const char *base_path,
- const char *filename)
-{
- char *combined = path_combine(base_path, filename);
- pstrcpy(dest, dest_size, combined);
- g_free(combined);
-}
-
/*
* Helper function for bdrv_parse_filename() implementations to remove optional
* protocol prefixes (especially "file:") from a filename and for putting the
@@ -4370,13 +4361,9 @@ BlockDriverState
*bdrv_find_backing_image(BlockDriverState *bs,
filename_full = g_malloc(PATH_MAX);
backing_file_full = g_malloc(PATH_MAX);
- filename_tmp = g_malloc(PATH_MAX);
is_protocol = path_has_protocol(backing_file);
- /* This will recursively refresh everything in the backing chain */
- bdrv_refresh_filename(bs);
-
for (curr_bs = bs; curr_bs->backing; curr_bs = curr_bs->backing->bs) {
/* If either of the filename paths is actually a protocol, then
@@ -4402,22 +4389,23 @@ BlockDriverState
*bdrv_find_backing_image(BlockDriverState *bs,
} else {
/* If not an absolute filename path, make it relative to the
current
* image's filename path */
- path_combine_deprecated(filename_tmp, PATH_MAX, curr_bs->filename,
- backing_file);
-
- /* We are going to compare absolute pathnames */
- if (!realpath(filename_tmp, filename_full)) {
+ filename_tmp = bdrv_make_absolute_filename(curr_bs, backing_file,
+ NULL);
+ /* We are going to compare canonicalized absolute pathnames */
+ if (!filename_tmp || !realpath(filename_tmp, filename_full)) {
+ g_free(filename_tmp);
continue;
}
+ g_free(filename_tmp);
/* We need to make sure the backing filename we are comparing
against
* is relative to the current image filename (or absolute) */
- path_combine_deprecated(filename_tmp, PATH_MAX, curr_bs->filename,
- curr_bs->backing_file);
-
- if (!realpath(filename_tmp, backing_file_full)) {
+ filename_tmp = bdrv_get_full_backing_filename(curr_bs, NULL);
+ if (!filename_tmp || !realpath(filename_tmp, backing_file_full)) {
+ g_free(filename_tmp);
continue;
}
+ g_free(filename_tmp);
if (strcmp(backing_file_full, filename_full) == 0) {
retval = curr_bs->backing->bs;
@@ -4428,7 +4416,6 @@ BlockDriverState
*bdrv_find_backing_image(BlockDriverState *bs,
g_free(filename_full);
g_free(backing_file_full);
- g_free(filename_tmp);
return retval;
}
--
2.17.1
- Re: [Qemu-devel] [Qemu-block] [PATCH v11 07/31] iotests.py: Add node_info(), (continued)
Re: [Qemu-devel] [PATCH v11 07/31] iotests.py: Add node_info(), Alberto Garcia, 2018/10/09
[Qemu-devel] [PATCH v11 08/31] iotests: Add test for backing file overrides, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 06/31] iotests.py: Add filter_imgfmt(), Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 09/31] block: Make path_combine() return the path, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 10/31] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 12/31] block: Add bdrv_make_absolute_filename(), Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 16/31] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 13/31] block: Fix bdrv_find_backing_image(),
Max Reitz <=
[Qemu-devel] [PATCH v11 11/31] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 14/31] block: Add bdrv_dirname(), Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 20/31] iotests: Add quorum case to test 110, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 18/31] block/nfs: Implement bdrv_dirname(), Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 15/31] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 19/31] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 17/31] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 21/31] block: Add strong_runtime_opts to BlockDriver, Max Reitz, 2018/10/05
[Qemu-devel] [PATCH v11 23/31] block: Generically refresh runtime options, Max Reitz, 2018/10/05