Am 04.05.2021 um 11:45 hat Vladimir Sementsov-Ogievskiy geschrieben:
> We have different types of parents: block nodes, block backends and
> jobs. So, it makes sense to specify type together with name.
>
> While being here also use g_autofree.
>
> iotest 307 output is updated.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> Reviewed-by: Alberto Garcia <be...@igalia.com>
> ---
> block/block-backend.c | 9 ++++-----
> tests/qemu-iotests/307.out | 2 +-
> 2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/block/block-backend.c b/block/block-backend.c
> index 6fca9853e1..2b7e9b5192 100644
> --- a/block/block-backend.c
> +++ b/block/block-backend.c
> @@ -142,19 +142,18 @@ static void blk_root_set_aio_ctx(BdrvChild *child,
> AioContext *ctx,
> static char *blk_root_get_parent_desc(BdrvChild *child)
> {
> BlockBackend *blk = child->opaque;
> - char *dev_id;
> + g_autofree char *dev_id = NULL;
>
> if (blk->name) {
> - return g_strdup(blk->name);
> + return g_strdup_printf("block device '%s'", blk->name);
> }
>
> dev_id = blk_get_attached_dev_id(blk);
> if (*dev_id) {
> - return dev_id;
> + return g_strdup_printf("block device '%s'", dev_id);
> } else {
> /* TODO Callback into the BB owner for something more detailed */
> - g_free(dev_id);
> - return g_strdup("a block device");
> + return g_strdup("unnamed block device");
We should probably keep the article: "an unnamed block device"
> }
> }
Kevin
