On Thu, 12/12 16:33, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <ben...@irqsave.net>
> ---
> block.c | 38 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/block.c b/block.c
> index 481d566..1c57f0d 100644
> --- a/block.c
> +++ b/block.c
> @@ -735,6 +735,39 @@ static int bdrv_open_flags(BlockDriverState *bs, int
> flags)
> return open_flags;
> }
>
> +static int bdrv_get_node_name(BlockDriverState *bs,
> + QDict *options,
> + Error **errp)
This function actually assigns the node-name to bs, could you call it
"bdrv_set_node_name" or "bdrv_assign_node_name", and only pass in the node-name
and move the parsing of options to the caller?
Fam
> +{
> + const char *node_name = NULL;
> +
> + node_name = qdict_get_try_str(options, "node-name");
> +
> + if (!node_name) {
> + return 0;
> + }
> +
> + /* empty string node name is invalid */
> + if (node_name[0] == '\0') {
> + error_setg(errp, "Empty node name");
> + return -EINVAL;
> + }
> +
> + /* takes care of avoiding duplicates node names */
> + if (bdrv_find_node(node_name)) {
> + error_setg(errp, "Duplicate node name");
> + return -EINVAL;
> + }
> +
> + /* copy node name into the bs and insert it into the graph list */
> + pstrcpy(bs->node_name, sizeof(bs->node_name), node_name);
> + QTAILQ_INSERT_TAIL(&graph_bdrv_states, bs, node_list);
> +
> + qdict_del(options, "node-name");
> +
> + return 0;
> +}
> +
> /*
> * Common part for opening disk images and files
> *
> @@ -759,6 +792,11 @@ static int bdrv_open_common(BlockDriverState *bs,
> BlockDriverState *file,
>
> trace_bdrv_open_common(bs, filename ?: "", flags, drv->format_name);
>
> + ret = bdrv_get_node_name(bs, options, errp);
> + if (ret < 0) {
> + return ret;
> + }
> +
> /* bdrv_open() with directly using a protocol as drv. This layer is
> already
> * opened, so assign it to bs (while file becomes a closed
> BlockDriverState)
> * and return immediately. */
> --
> 1.8.3.2
>
>
