[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 06/25] block: bdrv_get_full_backing_filename_from
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val. |
Date: |
Wed, 21 Jun 2017 14:50:28 +0200 |
Make bdrv_get_full_backing_filename_from_filename() return an allocated
string instead of placing the result in a caller-provided buffer.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
include/block/block.h | 7 +++----
block.c | 32 +++++++++++++++++++-------------
block/vmdk.c | 8 +++-----
3 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/include/block/block.h b/include/block/block.h
index 9f89fa7..e9df983 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -494,10 +494,9 @@ void bdrv_get_backing_filename(BlockDriverState *bs,
char *filename, int filename_size);
void bdrv_get_full_backing_filename(BlockDriverState *bs,
char *dest, size_t sz, Error **errp);
-void bdrv_get_full_backing_filename_from_filename(const char *backed,
- const char *backing,
- char *dest, size_t sz,
- Error **errp);
+char *bdrv_get_full_backing_filename_from_filename(const char *backed,
+ const char *backing,
+ Error **errp);
int path_has_protocol(const char *path);
int path_is_absolute(const char *path);
diff --git a/block.c b/block.c
index 80e4805..b70a9a8 100644
--- a/block.c
+++ b/block.c
@@ -287,20 +287,20 @@ int bdrv_set_read_only(BlockDriverState *bs, bool
read_only, Error **errp)
return 0;
}
-void bdrv_get_full_backing_filename_from_filename(const char *backed,
- const char *backing,
- char *dest, size_t sz,
- Error **errp)
+char *bdrv_get_full_backing_filename_from_filename(const char *backed,
+ const char *backing,
+ Error **errp)
{
if (backing[0] == '\0' || path_has_protocol(backing) ||
path_is_absolute(backing))
{
- pstrcpy(dest, sz, backing);
+ return g_strdup(backing);
} else if (backed[0] == '\0' || strstart(backed, "json:", NULL)) {
error_setg(errp, "Cannot use relative backing file names for '%s'",
backed);
+ return NULL;
} else {
- path_combine_deprecated(dest, sz, backed, backing);
+ return path_combine(backed, backing);
}
}
@@ -308,9 +308,15 @@ void bdrv_get_full_backing_filename(BlockDriverState *bs,
char *dest, size_t sz,
Error **errp)
{
char *backed = bs->exact_filename[0] ? bs->exact_filename : bs->filename;
+ char *full_name;
- bdrv_get_full_backing_filename_from_filename(backed, bs->backing_file,
- dest, sz, errp);
+ full_name = bdrv_get_full_backing_filename_from_filename(backed,
+ bs->backing_file,
+ errp);
+ if (full_name) {
+ pstrcpy(dest, sz, full_name);
+ g_free(full_name);
+ }
}
void bdrv_register(BlockDriver *bdrv)
@@ -4431,16 +4437,16 @@ 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);
+ char *full_backing;
int64_t size;
int back_flags;
QDict *backing_options = NULL;
- bdrv_get_full_backing_filename_from_filename(filename,
backing_file,
- full_backing,
PATH_MAX,
- &local_err);
+ full_backing =
+ bdrv_get_full_backing_filename_from_filename(filename,
+ backing_file,
+ &local_err);
if (local_err) {
- g_free(full_backing);
goto out;
}
diff --git a/block/vmdk.c b/block/vmdk.c
index 4389a69..4e92ce4 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1983,12 +1983,10 @@ static int vmdk_create(const char *filename, QemuOpts
*opts, Error **errp)
}
if (backing_file) {
BlockBackend *blk;
- char *full_backing = g_new0(char, PATH_MAX);
- bdrv_get_full_backing_filename_from_filename(filename, backing_file,
- full_backing, PATH_MAX,
- &local_err);
+ char *full_backing =
+ bdrv_get_full_backing_filename_from_filename(filename,
backing_file,
+ &local_err);
if (local_err) {
- g_free(full_backing);
error_propagate(errp, local_err);
ret = -ENOENT;
goto exit;
--
2.9.4
- [Qemu-block] [PATCH v5 00/25] block: Fix some filename generation issues, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 02/25] block: Use children list in bdrv_refresh_filename, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 01/25] block/mirror: Small absolute-paths simplification, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 03/25] block: Add BDS.backing_overridden, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 04/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 05/25] block: Make path_combine() return the path, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val.,
Max Reitz <=
- [Qemu-block] [PATCH v5 08/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 07/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 10/25] block: Add bdrv_dirname(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 13/25] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 11/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 12/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 14/25] block/nfs: Implement bdrv_dirname(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 15/25] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 16/25] block: Add 'base-directory' BDS option, Max Reitz, 2017/06/21