aboutsummaryrefslogtreecommitdiff
path: root/qom/object_interfaces.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-04-16 17:26:06 +0200
committerKevin Wolf <kwolf@redhat.com>2020-04-30 17:51:07 +0200
commiteaae29ef89d498d0eac553c77b554f310a47f809 (patch)
tree89b54cf0c904c6b2681ae9e500b0f8fdb05556b2 /qom/object_interfaces.c
parentd6a5beeb2bbf4f5ce6e6396051fb4c5fcced56a4 (diff)
qemu-storage-daemon: Fix non-string --object properties
After processing the option string with the keyval parser, we get a QDict that contains only strings. This QDict must be fed to a keyval visitor which converts the strings into the right data types. qmp_object_add(), however, uses the normal QObject input visitor, which expects a QDict where all properties already have the QType that matches the data type required by the QOM object type. Change the --object implementation in qemu-storage-daemon so that it doesn't call qmp_object_add(), but calls user_creatable_add_dict() directly instead and pass it a new keyval boolean that decides which visitor must be used. Reported-by: Coiby Xu <coiby.xu@gmail.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qom/object_interfaces.c')
-rw-r--r--qom/object_interfaces.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 739e3e5172..bc36f96e47 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -106,7 +106,7 @@ out:
return obj;
}
-void user_creatable_add_dict(QDict *qdict, Error **errp)
+void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp)
{
Visitor *v;
Object *obj;
@@ -127,7 +127,11 @@ void user_creatable_add_dict(QDict *qdict, Error **errp)
}
qdict_del(qdict, "id");
- v = qobject_input_visitor_new(QOBJECT(qdict));
+ if (keyval) {
+ v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
+ } else {
+ v = qobject_input_visitor_new(QOBJECT(qdict));
+ }
obj = user_creatable_add_type(type, id, qdict, v, errp);
visit_free(v);
object_unref(obj);