[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/19] block: bdrv_get_full_backing_filename's ret.
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 10/19] block: bdrv_get_full_backing_filename's ret. val. |
Date: |
Tue, 26 Apr 2016 23:32:09 +0200 |
Make bdrv_get_full_backing_filename() return an allocated string instead
of placing the result in a caller-provided buffer.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 24 ++++++++----------------
block/qapi.c | 12 ++----------
include/block/block.h | 3 +--
3 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/block.c b/block.c
index a12b1d3..083f4ae 100644
--- a/block.c
+++ b/block.c
@@ -218,19 +218,13 @@ char *bdrv_get_full_backing_filename_from_filename(const
char *backed,
}
}
-void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t
sz,
- Error **errp)
+char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp)
{
char *backed = bs->exact_filename[0] ? bs->exact_filename : bs->filename;
- char *full_name;
- 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);
- }
+ return bdrv_get_full_backing_filename_from_filename(backed,
+ bs->backing_file,
+ errp);
}
void bdrv_register(BlockDriver *bdrv)
@@ -1289,7 +1283,7 @@ out:
int bdrv_open_backing_file(BlockDriverState *bs, QDict *parent_options,
const char *bdref_key, Error **errp)
{
- char *backing_filename = g_malloc0(PATH_MAX);
+ char *backing_filename = NULL;
char *bdref_key_dot;
const char *reference = NULL;
int ret = 0;
@@ -1317,13 +1311,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict
*parent_options,
reference = qdict_get_try_str(parent_options, bdref_key);
if (reference || qdict_haskey(options, "file.filename")) {
bs->backing_overridden = true;
- backing_filename[0] = '\0';
+ backing_filename = NULL;
} else if (bs->backing_file[0] == '\0' && qdict_size(options) == 0) {
QDECREF(options);
goto free_exit;
} else {
- bdrv_get_full_backing_filename(bs, backing_filename, PATH_MAX,
- &local_err);
+ backing_filename = bdrv_get_full_backing_filename(bs, &local_err);
if (local_err) {
ret = -EINVAL;
error_propagate(errp, local_err);
@@ -1344,8 +1337,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict
*parent_options,
}
backing_hd = NULL;
- ret = bdrv_open_inherit(&backing_hd,
- *backing_filename ? backing_filename : NULL,
+ ret = bdrv_open_inherit(&backing_hd, backing_filename,
reference, options, 0, bs, &child_backing,
errp);
if (ret < 0) {
diff --git a/block/qapi.c b/block/qapi.c
index c5f6ba6..a0fb7fb 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -265,18 +265,10 @@ void bdrv_query_image_info(BlockDriverState *bs,
backing_filename = bs->backing_file;
if (backing_filename[0] != '\0') {
- char *backing_filename2 = g_malloc0(PATH_MAX);
+ char *backing_filename2;
info->backing_filename = g_strdup(backing_filename);
info->has_backing_filename = true;
- bdrv_get_full_backing_filename(bs, backing_filename2, PATH_MAX, &err);
- if (err) {
- /* Can't reconstruct the full backing filename, so we must omit
- * this field and apply a Best Effort to this query. */
- g_free(backing_filename2);
- backing_filename2 = NULL;
- error_free(err);
- err = NULL;
- }
+ backing_filename2 = bdrv_get_full_backing_filename(bs, NULL);
/* Always report the full_backing_filename if present, even if it's the
* same as backing_filename. That they are same is useful info. */
diff --git a/include/block/block.h b/include/block/block.h
index c6c00dd..83f9f31 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -433,8 +433,7 @@ void bdrv_round_to_clusters(BlockDriverState *bs,
const char *bdrv_get_encrypted_filename(BlockDriverState *bs);
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);
+char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp);
char *bdrv_get_full_backing_filename_from_filename(const char *backed,
const char *backing,
Error **errp);
--
2.8.0
- [Qemu-devel] [PATCH 00/19] block: Fix some filename generation issues, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 02/19] block: Add BDS.backing_overridden, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 01/19] block: Use children list in bdrv_refresh_filename, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 04/19] block: Add bdrv_default_refresh_format_filename, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 03/19] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 05/19] block: Add bdrv_default_refresh_protocol_filename, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 09/19] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 06/19] block: Make bdrv_default_refresh_format_filename public, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 07/19] qcow2: Implement bdrv_refresh_filename(), Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 10/19] block: bdrv_get_full_backing_filename's ret. val.,
Max Reitz <=
- [Qemu-devel] [PATCH 12/19] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 08/19] block: Make path_combine() return the path, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 15/19] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 11/19] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 13/19] block: Add bdrv_dirname(), Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 14/19] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 16/19] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 17/19] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 18/19] block: Add 'base-directory' BDS option, Max Reitz, 2016/04/26
- [Qemu-devel] [PATCH 19/19] iotests: Add quorum case to test 110, Max Reitz, 2016/04/26