Re: [PATCH 1/4] bootconfig: Change array value to use child node

[Masami Hiramatsu]

Hi,

Devin reported that I forgot to update /proc/bootconfig.
Let me update the series. (including the description)

Thank you,

On Sun, 16 May 2021 23:55:31 +0900
Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:

> Change array value to use child node of the xbc_node tree
> instead of next node.
> 
> Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>
> ---
>  tools/bootconfig/main.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
> index 2696eb0fc149..3178a31fdabc 100644
> --- a/include/linux/bootconfig.h
> +++ b/include/linux/bootconfig.h
> @@ -71,7 +71,7 @@ static inline __init bool xbc_node_is_key(struct xbc_node *node)
>   */
>  static inline __init bool xbc_node_is_array(struct xbc_node *node)
>  {
> -	return xbc_node_is_value(node) && node->next != 0;
> +	return xbc_node_is_value(node) && node->child != 0;
>  }
>  
>  /**
> @@ -140,7 +140,7 @@ static inline struct xbc_node * __init xbc_find_node(const char *key)
>   */
>  #define xbc_array_for_each_value(anode, value)				\
>  	for (value = xbc_node_get_data(anode); anode != NULL ;		\
> -	     anode = xbc_node_get_next(anode),				\
> +	     anode = xbc_node_get_child(anode),				\
>  	     value = anode ? xbc_node_get_data(anode) : NULL)
>  
>  /**
> @@ -171,7 +171,7 @@ static inline struct xbc_node * __init xbc_find_node(const char *key)
>   */
>  #define xbc_node_for_each_array_value(node, key, anode, value)		\
>  	for (value = xbc_node_find_value(node, key, &anode); value != NULL; \
> -	     anode = xbc_node_get_next(anode),				\
> +	     anode = xbc_node_get_child(anode),				\
>  	     value = anode ? xbc_node_get_data(anode) : NULL)
>  
>  /**
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 9f8c70a98fcf..44dcdcbd746a 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -367,6 +367,14 @@ static inline __init struct xbc_node *xbc_last_sibling(struct xbc_node *node)
>  	return node;
>  }
>  
> +static inline __init struct xbc_node *xbc_last_child(struct xbc_node *node)
> +{
> +	while (node->child)
> +		node = xbc_node_get_child(node);
> +
> +	return node;
> +}
> +
>  static struct xbc_node * __init xbc_add_sibling(char *data, u32 flag)
>  {
>  	struct xbc_node *sib, *node = xbc_add_node(data, flag);
> @@ -517,17 +525,20 @@ static int __init xbc_parse_array(char **__v)
>  	char *next;
>  	int c = 0;
>  
> +	if (last_parent->child)
> +		last_parent = xbc_node_get_child(last_parent);
> +
>  	do {
>  		c = __xbc_parse_value(__v, &next);
>  		if (c < 0)
>  			return c;
>  
> -		node = xbc_add_sibling(*__v, XBC_VALUE);
> +		node = xbc_add_child(*__v, XBC_VALUE);
>  		if (!node)
>  			return -ENOMEM;
>  		*__v = next;
>  	} while (c == ',');
> -	node->next = 0;
> +	node->child = 0;
>  
>  	return c;
>  }
> @@ -615,8 +626,12 @@ static int __init xbc_parse_kv(char **k, char *v, int op)
>  
>  	if (op == ':' && child) {
>  		xbc_init_node(child, v, XBC_VALUE);
> -	} else if (!xbc_add_sibling(v, XBC_VALUE))
> -		return -ENOMEM;
> +	} else {
> +		if (op == '+' && child)
> +			last_parent = xbc_last_child(child);
> +		if (!xbc_add_sibling(v, XBC_VALUE))
> +			return -ENOMEM;
> +	}
>  
>  	if (c == ',') {	/* Array */
>  		c = xbc_parse_array(&next);
> diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c
> index 7362bef1a368..aaa4fec1c431 100644
> --- a/tools/bootconfig/main.c
> +++ b/tools/bootconfig/main.c
> @@ -27,7 +27,7 @@ static int xbc_show_value(struct xbc_node *node, bool semicolon)
>  			q = '\'';
>  		else
>  			q = '"';
> -		printf("%c%s%c%s", q, val, q, node->next ? ", " : eol);
> +		printf("%c%s%c%s", q, val, q, node->child ? ", " : eol);
>  		i++;
>  	}
>  	return i;
> 


-- 
Masami Hiramatsu <mhiramat@xxxxxxxxxx>