[PATCH 09/11] qdev: Avoid QemuOpts in QMP device_add
Directly call qdev_device_add_from_qdict() for QMP device_add instead of
first going through QemuOpts and converting back to QDict.
Note that this changes the behaviour of device_add, though in ways that
should be considered bug fixes:
QemuOpts ignores differences between data types, so you could
successfully pass a string "123" for an integer property, or a string
"on" for a boolean property (and vice versa). After this change, the
correct data type for the property must be used in the JSON input.
qemu_opts_from_qdict() also silently ignores any options whose value is
a QDict, QList or QNull.
To illustrate, the following QMP command was accepted before and is now
rejected for both reasons:
{ "execute": "device_add",
"arguments": { "driver": "scsi-cd",
"drive": { "completely": "invalid" },
"physical_block_size": "4096" } }
Signed-off-by: Kevin Wolf <kwolf(a)redhat.com>
---
softmmu/qdev-monitor.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index c09b7430eb..8622ccade6 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -812,7 +812,8 @@ void hmp_info_qdm(Monitor *mon, const QDict *qdict)
qdev_print_devinfos(true);
}
-void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)
+static void monitor_device_add(QDict *qdict, QObject **ret_data,
+ bool from_json, Error **errp)
{
QemuOpts *opts;
DeviceState *dev;
@@ -825,7 +826,9 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)
qemu_opts_del(opts);
return;
}
- dev = qdev_device_add(opts, errp);
+ qemu_opts_del(opts);
+
+ dev = qdev_device_add_from_qdict(qdict, from_json, errp);
/*
* Drain all pending RCU callbacks. This is done because
@@ -838,13 +841,14 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)
*/
drain_call_rcu();
- if (!dev) {
- qemu_opts_del(opts);
- return;
- }
object_unref(OBJECT(dev));
}
+void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp)
+{
+ monitor_device_add(qdict, ret_data, true, errp);
+}
+
static DeviceState *find_device_state(const char *id, Error **errp)
{
Object *obj;
@@ -936,7 +940,7 @@ void hmp_device_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
- qmp_device_add((QDict *)qdict, NULL, &err);
+ monitor_device_add((QDict *)qdict, NULL, false, &err);
hmp_handle_error(mon, err);
}
--
2.31.1