[PATCH 08/11] qdev: Base object creation on QDict rather than QemuOpts
Kevin Wolf
kwolf at redhat.com
Fri Sep 24 09:04:24 UTC 2021
QDicts are both what QMP natively uses and what the keyval parser
produces. Going through QemuOpts isn't useful for either one, so switch
the main device creation function to QDicts. By sharing more code with
the -object/object-add code path, we can even reduce the code size a
bit.
This commit doesn't remove the detour through QemuOpts from any code
path yet, but it allows the following commits to do so.
Signed-off-by: Kevin Wolf <kwolf at redhat.com>
---
include/hw/qdev-core.h | 8 ++---
hw/core/qdev.c | 5 ++--
hw/net/virtio-net.c | 4 +--
hw/vfio/pci.c | 4 +--
softmmu/qdev-monitor.c | 67 +++++++++++++++++++-----------------------
5 files changed, 41 insertions(+), 47 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 1857d9698e..5b3d4704a5 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -180,7 +180,7 @@ struct DeviceState {
char *canonical_path;
bool realized;
bool pending_deleted_event;
- QemuOpts *opts;
+ QDict *opts;
int hotplugged;
bool allow_unplug_during_migration;
BusState *parent_bus;
@@ -202,7 +202,7 @@ struct DeviceListener {
* hide a failover device depending for example on the device
* opts.
*/
- bool (*hide_device)(DeviceListener *listener, QemuOpts *device_opts);
+ bool (*hide_device)(DeviceListener *listener, const QDict *device_opts);
QTAILQ_ENTRY(DeviceListener) link;
};
@@ -831,13 +831,13 @@ void device_listener_unregister(DeviceListener *listener);
/**
* @qdev_should_hide_device:
- * @opts: QemuOpts as passed on cmdline.
+ * @opts: options QDict
*
* Check if a device should be added.
* When a device is added via qdev_device_add() this will be called,
* and return if the device should be added now or not.
*/
-bool qdev_should_hide_device(QemuOpts *opts);
+bool qdev_should_hide_device(const QDict *opts);
typedef enum MachineInitPhase {
/* current_machine is NULL. */
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index d918b50a1d..5b889866c5 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -28,6 +28,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qapi-events-qdev.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
@@ -211,7 +212,7 @@ void device_listener_unregister(DeviceListener *listener)
QTAILQ_REMOVE(&device_listeners, listener, link);
}
-bool qdev_should_hide_device(QemuOpts *opts)
+bool qdev_should_hide_device(const QDict *opts)
{
DeviceListener *listener;
@@ -955,7 +956,7 @@ static void device_finalize(Object *obj)
dev->canonical_path = NULL;
}
- qemu_opts_del(dev->opts);
+ qobject_unref(dev->opts);
g_free(dev->id);
}
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index f205331dcf..5684c2b2b7 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3304,7 +3304,7 @@ static void virtio_net_migration_state_notifier(Notifier *notifier, void *data)
}
static bool failover_hide_primary_device(DeviceListener *listener,
- QemuOpts *device_opts)
+ const QDict *device_opts)
{
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
const char *standby_id;
@@ -3312,7 +3312,7 @@ static bool failover_hide_primary_device(DeviceListener *listener,
if (!device_opts) {
return false;
}
- standby_id = qemu_opt_get(device_opts, "failover_pair_id");
+ standby_id = qdict_get_try_str(device_opts, "failover_pair_id");
if (g_strcmp0(standby_id, n->netclient_name) != 0) {
return false;
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 4feaa1cb68..5cdf1d4298 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -29,10 +29,10 @@
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
#include "migration/vmstate.h"
+#include "qapi/qmp/qdict.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
-#include "qemu/option.h"
#include "qemu/range.h"
#include "qemu/units.h"
#include "sysemu/kvm.h"
@@ -941,7 +941,7 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev)
}
if (vfio_opt_rom_in_denylist(vdev)) {
- if (dev->opts && qemu_opt_get(dev->opts, "rombar")) {
+ if (dev->opts && qdict_haskey(dev->opts, "rombar")) {
warn_report("Device at %s is known to cause system instability"
" issues during option rom execution",
vdev->vbasedev.name);
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index c2af906df0..c09b7430eb 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -196,34 +196,6 @@ static void qdev_print_devinfos(bool show_no_user)
g_slist_free(list);
}
-static int set_property(void *opaque, const char *name, const char *value,
- Error **errp)
-{
- Object *obj = opaque;
- QString *val;
- Visitor *v;
- int ret;
-
- if (strcmp(name, "driver") == 0)
- return 0;
- if (strcmp(name, "bus") == 0)
- return 0;
-
- val = qstring_from_str(value);
- v = qobject_input_visitor_new_keyval(QOBJECT(val));
-
- if (!object_property_set(obj, name, v, errp)) {
- ret = -1;
- goto out;
- }
-
- ret = 0;
-out:
- visit_free(v);
- qobject_unref(val);
- return ret;
-}
-
static const char *find_typename_by_alias(const char *alias)
{
int i;
@@ -611,15 +583,17 @@ void qdev_set_id(DeviceState *dev, char *id, Error **errp)
}
}
-DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
+static DeviceState *qdev_device_add_from_qdict(const QDict *opts,
+ bool from_json, Error **errp)
{
ERRP_GUARD();
DeviceClass *dc;
const char *driver, *path;
+ char *id;
DeviceState *dev = NULL;
BusState *bus = NULL;
- driver = qemu_opt_get(opts, "driver");
+ driver = qdict_get_try_str(opts, "driver");
if (!driver) {
error_setg(errp, QERR_MISSING_PARAMETER, "driver");
return NULL;
@@ -632,7 +606,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
}
/* find bus */
- path = qemu_opt_get(opts, "bus");
+ path = qdict_get_try_str(opts, "bus");
if (path != NULL) {
bus = qbus_find(path, errp);
if (!bus) {
@@ -652,8 +626,8 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
}
}
- if (qemu_opt_get(opts, "failover_pair_id")) {
- if (!opts->id) {
+ if (qdict_haskey(opts, "failover_pair_id")) {
+ if (!qdict_haskey(opts, "id")) {
error_setg(errp, "Device with failover_pair_id don't have id");
return NULL;
}
@@ -692,19 +666,25 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
}
}
- qdev_set_id(dev, g_strdup(qemu_opts_id(opts)), errp);
+ id = g_strdup(qdict_get_try_str(opts, "id"));
+ qdev_set_id(dev, id, errp);
if (*errp) {
goto err_del_dev;
}
/* set properties */
- if (qemu_opt_foreach(opts, set_property, dev, errp)) {
+ dev->opts = qdict_clone_shallow(opts);
+ qdict_del(dev->opts, "driver");
+ qdict_del(dev->opts, "bus");
+ qdict_del(dev->opts, "id");
+
+ object_set_properties_from_keyval(&dev->parent_obj, dev->opts, from_json,
+ errp);
+ if (*errp) {
goto err_del_dev;
}
- dev->opts = opts;
if (!qdev_realize(DEVICE(dev), bus, errp)) {
- dev->opts = NULL;
goto err_del_dev;
}
return dev;
@@ -717,6 +697,19 @@ err_del_dev:
return NULL;
}
+/* Takes ownership of @opts on success */
+DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
+{
+ QDict *qdict = qemu_opts_to_qdict(opts, NULL);
+ DeviceState *ret;
+
+ ret = qdev_device_add_from_qdict(qdict, false, errp);
+ if (ret) {
+ qemu_opts_del(opts);
+ }
+ qobject_unref(qdict);
+ return ret;
+}
#define qdev_printf(fmt, ...) monitor_printf(mon, "%*s" fmt, indent, "", ## __VA_ARGS__)
static void qbus_print(Monitor *mon, BusState *bus, int indent);
--
2.31.1
More information about the libvir-list
mailing list