All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, kraxel@redhat.com, kwolf@redhat.com,
	hreitz@redhat.com, marcandre.lureau@redhat.com,
	dgilbert@redhat.com, mst@redhat.com, imammedo@redhat.com,
	ani@anisinha.ca, eduardo@habkost.net, marcel.apfelbaum@gmail.com,
	philmd@linaro.org, wangyanan55@huawei.com, jasowang@redhat.com,
	jiri@resnulli.us, berrange@redhat.com, thuth@redhat.com,
	quintela@redhat.com, stefanb@linux.vnet.ibm.com,
	stefanha@redhat.com, kvm@vger.kernel.org, qemu-block@nongnu.org
Subject: [PATCH 14/32] hmp: Rewrite strlist_from_comma_list() as hmp_split_at_comma()
Date: Tue, 24 Jan 2023 13:19:28 +0100	[thread overview]
Message-ID: <20230124121946.1139465-15-armbru@redhat.com> (raw)
In-Reply-To: <20230124121946.1139465-1-armbru@redhat.com>

Use g_strsplit() for the actual splitting.  Give external linkage, so
the next commit can move one of its users to another source file.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 include/monitor/hmp.h |  1 +
 monitor/hmp-cmds.c    | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
index 6fafa7ffb4..d60d1305b8 100644
--- a/include/monitor/hmp.h
+++ b/include/monitor/hmp.h
@@ -19,6 +19,7 @@
 
 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/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index edb50da1ff..2ca869c2ee 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -54,28 +54,21 @@ bool hmp_handle_error(Monitor *mon, Error *err)
 }
 
 /*
- * Produce a strList from a comma separated list.
- * A NULL or empty input string return NULL.
+ * Split @str at comma.
+ * A null @str defaults to "".
  */
-static strList *strList_from_comma_list(const char *in)
+strList *hmp_split_at_comma(const char *str)
 {
+    char **split = g_strsplit(str ?: "", ",", -1);
     strList *res = NULL;
     strList **tail = &res;
+    int i;
 
-    while (in && in[0]) {
-        char *comma = strchr(in, ',');
-        char *value;
-
-        if (comma) {
-            value = g_strndup(in, comma - in);
-            in = comma + 1; /* skip the , */
-        } else {
-            value = g_strdup(in);
-            in = NULL;
-        }
-        QAPI_LIST_APPEND(tail, value);
+    for (i = 0; split[i]; i++) {
+        QAPI_LIST_APPEND(tail, split[i]);
     }
 
+    g_free(split);
     return res;
 }
 
@@ -632,7 +625,7 @@ void hmp_announce_self(Monitor *mon, const QDict *qdict)
                                             migrate_announce_params());
 
     qapi_free_strList(params->interfaces);
-    params->interfaces = strList_from_comma_list(interfaces_str);
+    params->interfaces = hmp_split_at_comma(interfaces_str);
     params->has_interfaces = params->interfaces != NULL;
     params->id = g_strdup(id);
     qmp_announce_self(params, NULL);
@@ -1234,7 +1227,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 = strList_from_comma_list(names);
+                request->names = hmp_split_at_comma(names);
             }
             QAPI_LIST_PREPEND(request_list, request);
         }
-- 
2.39.0


  parent reply	other threads:[~2023-01-24 12:21 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-24 12:19 [PATCH 00/32] Move and clean up monitor command code Markus Armbruster
2023-01-24 12:19 ` [PATCH 01/32] monitor: Drop unnecessary includes Markus Armbruster
2023-01-24 22:43   ` Stefan Berger
2023-01-24 12:19 ` [PATCH 02/32] audio: Move HMP commands from monitor/ to audio/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 03/32] char: Move HMP commands from monitor/ to chardev/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 04/32] char: Factor out qmp_add_client() parts and move " Markus Armbruster
2023-01-24 12:19 ` [PATCH 05/32] hmp: Drop redundant argument check from add_completion_option() Markus Armbruster
2023-01-24 12:19 ` [PATCH 06/32] readline: Extract readline_add_completion_of() from monitor Markus Armbruster
2023-01-24 12:19 ` [PATCH 07/32] hmp: Rename help_cmd() to hmp_help_cmd(), move declaration to hmp.h Markus Armbruster
2023-01-24 12:19 ` [PATCH 08/32] trace: Move HMP commands from monitor/ to trace/ Markus Armbruster
2023-01-24 12:22   ` Philippe Mathieu-Daudé
2023-01-24 14:21   ` Stefan Hajnoczi
2023-01-24 12:19 ` [PATCH 09/32] machine: Move QMP commands from monitor/ to hw/core/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 10/32] machine: Move HMP " Markus Armbruster
2023-01-24 12:19 ` [PATCH 11/32] qom: Move HMP commands from monitor/ to qom/ Markus Armbruster
2023-01-24 12:23   ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 12/32] block: Factor out hmp_change_medium(), and move to block/monitor/ Markus Armbruster
2023-01-24 14:20   ` Stefan Hajnoczi
2023-01-26 13:29   ` Stefan Berger
2023-01-24 12:19 ` [PATCH 13/32] rocker: Move HMP commands from monitor to hw/net/rocker/ Markus Armbruster
2023-01-24 12:19 ` Markus Armbruster [this message]
2023-01-24 12:19 ` [PATCH 15/32] net: Move HMP commands from monitor to net/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 16/32] net: Move hmp_info_network() to net-hmp-cmds.c Markus Armbruster
2023-01-24 12:19 ` [PATCH 17/32] migration: Move HMP commands from monitor/ to migration/ Markus Armbruster
2023-02-01 20:46   ` Juan Quintela
2023-01-24 12:19 ` [PATCH 18/32] migration: Move the QMP command " Markus Armbruster
2023-02-01 20:46   ` Juan Quintela
2023-01-24 12:19 ` [PATCH 19/32] virtio: Move HMP commands from monitor/ to hw/virtio/ Markus Armbruster
2023-01-24 12:24   ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 20/32] tpm: Move HMP commands from monitor/ to softmmu/ Markus Armbruster
2023-01-24 22:39   ` Stefan Berger
2023-01-24 12:19 ` [PATCH 21/32] runstate: " Markus Armbruster
2023-01-24 12:19 ` [PATCH 22/32] stats: Move QMP commands from monitor/ to stats/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 23/32] stats: Move HMP " Markus Armbruster
2023-01-24 12:19 ` [PATCH 24/32] acpi: Move the QMP command from monitor/ to hw/acpi/ Markus Armbruster
2023-01-24 12:25   ` Philippe Mathieu-Daudé
2023-01-24 12:19 ` [PATCH 25/32] qdev: Move HMP command completion from monitor to softmmu/ Markus Armbruster
2023-01-24 12:19 ` [PATCH 26/32] monitor: Split file descriptor passing stuff off misc.c Markus Armbruster
2023-01-24 12:19 ` [PATCH 27/32] monitor: Move monitor_putc() next to monitor_puts & external linkage Markus Armbruster
2023-01-24 12:19 ` [PATCH 28/32] monitor: Move target-dependent HMP commands to hmp-cmds-target.c Markus Armbruster
2023-01-24 12:19 ` [PATCH 29/32] monitor: Move remaining HMP commands from misc.c to hmp-cmds.c Markus Armbruster
2023-01-24 12:19 ` [PATCH 30/32] monitor: Move remaining QMP stuff from misc.c to qmp-cmds.c Markus Armbruster
2023-01-24 12:19 ` [PATCH 31/32] monitor: Loosen coupling between misc.c and monitor.c slightly Markus Armbruster
2023-01-24 12:19 ` [PATCH 32/32] monitor: Rename misc.c to hmp-target.c Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230124121946.1139465-15-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=ani@anisinha.ca \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=hreitz@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=jiri@resnulli.us \
    --cc=kraxel@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=kwolf@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wangyanan55@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.