On Thu, Feb 09, 2023 at 10:27:49AM +0000, Het Gala wrote:
> renamed hmp_split_at_comma() --> str_split_at_comma()
> Shifted helper function to qapi-util.c file. Give external linkage, as
> this function will be handy in coming commit for migration.
>
> Minor correction:
> g_strsplit(str ?: "", ",", -1) --> g_strsplit(str ? str : "", ",", -1)
>
> Reviewed-by: Eric Blake <ebl...@redhat.com>
> Reviewed-by: Markus Armbruster <arm...@redhat.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
Why have these Reviewed-by tags been added to this patch and all
others in the series ?
In the v2 posting all I see are some comments from Eric, and he
didn't give a Reviewed-by approval. I don't see any feedback from
Markus or David on list for the v2 posting.
> Suggested-by: Daniel P. Berrange <berra...@redhat.com>
> Suggested-by: Manish Mishra <manish.mis...@nutanix.com>
> Suggested-by: Aravind Retnakaran <aravind.retnaka...@nutanix.com>
> Signed-off-by: Het Gala <het.g...@nutanix.com>
> ---
> include/monitor/hmp.h | 1 -
> include/qapi/util.h | 1 +
> monitor/hmp-cmds.c | 19 -------------------
> net/net-hmp-cmds.c | 2 +-
> qapi/qapi-util.c | 19 +++++++++++++++++++
> stats/stats-hmp-cmds.c | 2 +-
> 6 files changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
> index 2220f14fc9..e80848fbd0 100644
> --- a/include/monitor/hmp.h
> +++ b/include/monitor/hmp.h
> @@ -19,7 +19,6 @@
>
> bool hmp_handle_error(Monitor *mon, Error *err);
> void hmp_help_cmd(Monitor *mon, const char *name);
> -strList *hmp_split_at_comma(const char *str);
>
> void hmp_info_name(Monitor *mon, const QDict *qdict);
> void hmp_info_version(Monitor *mon, const QDict *qdict);
> diff --git a/include/qapi/util.h b/include/qapi/util.h
> index 81a2b13a33..6c8d8575e3 100644
> --- a/include/qapi/util.h
> +++ b/include/qapi/util.h
> @@ -29,6 +29,7 @@ bool qapi_bool_parse(const char *name, const char *value,
> bool *obj,
> Error **errp);
>
> int parse_qapi_name(const char *name, bool complete);
> +struct strList *str_split_at_comma(const char *str);
>
> /*
> * For any GenericList @list, insert @element at the front.
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 34bd8c67d7..9665e6e0a5 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -39,25 +39,6 @@ bool hmp_handle_error(Monitor *mon, Error *err)
> return false;
> }
>
> -/*
> - * Split @str at comma.
> - * A null @str defaults to "".
> - */
> -strList *hmp_split_at_comma(const char *str)
> -{
> - char **split = g_strsplit(str ?: "", ",", -1);
> - strList *res = NULL;
> - strList **tail = &res;
> - int i;
> -
> - for (i = 0; split[i]; i++) {
> - QAPI_LIST_APPEND(tail, split[i]);
> - }
> -
> - g_free(split);
> - return res;
> -}
> -
> void hmp_info_name(Monitor *mon, const QDict *qdict)
> {
> NameInfo *info;
> diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c
> index 41d326bf5f..a3c597a727 100644
> --- a/net/net-hmp-cmds.c
> +++ b/net/net-hmp-cmds.c
> @@ -72,7 +72,7 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict)
> migrate_announce_params());
>
> qapi_free_strList(params->interfaces);
> - params->interfaces = hmp_split_at_comma(interfaces_str);
> + params->interfaces = str_split_at_comma(interfaces_str);
> params->has_interfaces = params->interfaces != NULL;
> params->id = g_strdup(id);
> qmp_announce_self(params, NULL);
> diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
> index 63596e11c5..e26b9d957b 100644
> --- a/qapi/qapi-util.c
> +++ b/qapi/qapi-util.c
> @@ -152,3 +152,22 @@ int parse_qapi_name(const char *str, bool complete)
> }
> return p - str;
> }
> +
> +/*
> + * Split @str at comma.
> + * A null @str defaults to "".
> + */
> +strList *str_split_at_comma(const char *str)
> +{
> + char **split = g_strsplit(str ? str : "", ",", -1);
> + strList *res = NULL;
> + strList **tail = &res;
> + int i;
> +
> + for (i = 0; split[i]; i++) {
> + QAPI_LIST_APPEND(tail, split[i]);
> + }
> +
> + g_free(split);
> + return res;
> +}
> diff --git a/stats/stats-hmp-cmds.c b/stats/stats-hmp-cmds.c
> index 531e35d128..cfee05a076 100644
> --- a/stats/stats-hmp-cmds.c
> +++ b/stats/stats-hmp-cmds.c
> @@ -174,7 +174,7 @@ static StatsFilter *stats_filter(StatsTarget target,
> const char *names,
> request->provider = provider_idx;
> if (names && !g_str_equal(names, "*")) {
> request->has_names = true;
> - request->names = hmp_split_at_comma(names);
> + request->names = str_split_at_comma(names);
> }
> QAPI_LIST_PREPEND(request_list, request);
> }
> --
> 2.22.3
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
