[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] qdev: Avoid using string visitor for properties
From: |
Kevin Wolf |
Subject: |
[PULL 07/15] qdev: Avoid using string visitor for properties |
Date: |
Fri, 15 Oct 2021 16:46:32 +0200 |
The only thing the string visitor adds compared to a keyval visitor is
list support. git grep for 'visit_start_list' and 'visit.*List' shows
that devices don't make use of this.
In a world with a QAPIfied command line interface, the keyval visitor is
used to parse the command line. In order to make sure that no devices
start using this feature that would make backwards compatibility harder,
just switch away from object_property_parse(), which internally uses the
string visitor, to a keyval visitor and object_property_set().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20211008133442.141332-8-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
softmmu/qdev-monitor.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index 3df99ce9fc..672f87ed4f 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -28,6 +28,8 @@
#include "qapi/qmp/dispatch.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qobject-input-visitor.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "qemu/help_option.h"
@@ -198,16 +200,28 @@ 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;
- if (!object_property_parse(obj, name, value, errp)) {
- return -1;
+ 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;
}
- return 0;
+
+ ret = 0;
+out:
+ visit_free(v);
+ qobject_unref(val);
+ return ret;
}
static const char *find_typename_by_alias(const char *alias)
--
2.31.1
- [PULL 00/15] qdev: Add JSON -device, Kevin Wolf, 2021/10/15
- [PULL 01/15] net: Introduce NetClientInfo.check_peer_type(), Kevin Wolf, 2021/10/15
- [PULL 02/15] net/vhost-user: Fix device compatibility check, Kevin Wolf, 2021/10/15
- [PULL 03/15] net/vhost-vdpa: Fix device compatibility check, Kevin Wolf, 2021/10/15
- [PULL 04/15] qom: Reduce use of error_propagate(), Kevin Wolf, 2021/10/15
- [PULL 05/15] iotests/245: Fix type for iothread property, Kevin Wolf, 2021/10/15
- [PULL 06/15] iotests/051: Fix typo, Kevin Wolf, 2021/10/15
- [PULL 07/15] qdev: Avoid using string visitor for properties,
Kevin Wolf <=
- [PULL 08/15] qdev: Make DeviceState.id independent of QemuOpts, Kevin Wolf, 2021/10/15
- [PULL 10/15] qemu-option: Allow deleting opts during qemu_opts_foreach(), Kevin Wolf, 2021/10/15
- [PULL 11/15] qdev: Add Error parameter to hide_device() callbacks, Kevin Wolf, 2021/10/15
- [PULL 14/15] qdev: Base object creation on QDict rather than QemuOpts, Kevin Wolf, 2021/10/15
- [PULL 12/15] virtio-net: Store failover primary opts pointer locally, Kevin Wolf, 2021/10/15
- [PULL 13/15] virtio-net: Avoid QemuOpts in failover_find_primary_device(), Kevin Wolf, 2021/10/15
- [PULL 09/15] softmmu/qdev-monitor: add error handling in qdev_set_id, Kevin Wolf, 2021/10/15
- [PULL 15/15] vl: Enable JSON syntax for -device, Kevin Wolf, 2021/10/15
- Re: [PULL 00/15] qdev: Add JSON -device, Richard Henderson, 2021/10/15