HMP is using QemuOpts to parse free-form commands device_add,
netdev_add and object_add. However, none of these need QemuOpts
for validation (these three QemuOptsLists are all of the catch-all
kind), and keyval is already able to parse into QDict. So use
keyval directly, avoiding the detour from
string to QemuOpts to QDict.
The args_type now stores the implied key. This arguably makes more
sense than storing the QemuOptsList name; at least, it _is_ a key
that might end up in the arguments QDict.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
hmp-commands.hx | 6 +++---
monitor/hmp.c | 20 +++++++++-----------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 73e0832ea1..6ee746b53e 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -669,7 +669,7 @@ ERST
{
.name = "device_add",
- .args_type = "device:O",
+ .args_type = "driver:O",
.params = "driver[,prop=value][,...]",
.help = "add device, like -device on the command line",
.cmd = hmp_device_add,
@@ -1315,7 +1315,7 @@ ERST
{
.name = "netdev_add",
- .args_type = "netdev:O",
+ .args_type = "type:O",
.params =
"[user|tap|socket|vde|bridge|hubport|netmap|vhost-user],id=str[,prop=value][,...]",
.help = "add host network device",
.cmd = hmp_netdev_add,
@@ -1343,7 +1343,7 @@ ERST
{
.name = "object_add",
- .args_type = "object:O",
+ .args_type = "qom-type:O",
.params = "[qom-type=]type,id=str[,prop=value][,...]",
.help = "create QOM object",
.cmd = hmp_object_add,
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 6c0b33a0b1..d2cb886da5 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -744,13 +744,9 @@ static QDict *monitor_parse_arguments(Monitor *mon,
break;
case 'O':
{
- QemuOptsList *opts_list;
- QemuOpts *opts;
+ Error *errp;
+ bool help;
- opts_list = qemu_find_opts(key);
- if (!opts_list || opts_list->desc->name) {
- goto bad_type;
- }
while (qemu_isspace(*p)) {
p++;
}
@@ -760,12 +756,14 @@ static QDict *monitor_parse_arguments(Monitor *mon,
if (get_str(buf, sizeof(buf), &p) < 0) {
goto fail;
}
- opts = qemu_opts_parse_noisily(opts_list, buf, true);
- if (!opts) {
- goto fail;
+ keyval_parse_into(qdict, buf, key, &help, &errp);
+ if (help) {
+ if (qdict_haskey(qdict, key)) {
+ qdict_put_bool(qdict, "help", true);
+ } else {
+ qdict_put_str(qdict, key, "help");
+ }
}
- qemu_opts_to_qdict(opts, qdict);
- qemu_opts_del(opts);
}
break;
case '/':
--
2.26.2
