aboutsummaryrefslogtreecommitdiff
path: root/include/qom
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 /include/qom
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 'include/qom')
-rw-r--r--include/qom/object_interfaces.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index a0037968a4..65172120fa 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -90,6 +90,10 @@ Object *user_creatable_add_type(const char *type, const char *id,
/**
* user_creatable_add_dict:
* @qdict: the object definition
+ * @keyval: if true, use a keyval visitor for processing @qdict (i.e.
+ * assume that all @qdict values are strings); otherwise, use
+ * the normal QObject visitor (i.e. assume all @qdict values
+ * have the QType expected by the QOM object type)
* @errp: if an error occurs, a pointer to an area to store the error
*
* Create an instance of the user creatable object that is defined by
@@ -97,7 +101,7 @@ Object *user_creatable_add_type(const char *type, const char *id,
* ID from the key 'id'. The remaining entries in @qdict are used to
* initialize the object properties.
*/
-void user_creatable_add_dict(QDict *qdict, Error **errp);
+void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp);
/**
* user_creatable_add_opts: