qemu-storage-daemon: Fix non-string --object properties
cover qemu-storage-daemon: Fix non-string --object properties
Kevin Wolf (2):
qom: Factor out user_creatable_add_dict()
qemu-storage-daemon: Fix non-string --object properties
include/qom/object_interfaces.h | 16 ++++++++++++++++ qemu-storage-daemon.c | 4 +--- qom/object_interfaces.c | 31 +++++++++++++++++++++++++++++++ qom/qom-qmp-cmds.c | 24 +----------------------- 4 files changed, 49 insertions(+), 26 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 qom: Factor out user_creatable_add_dict()
The QMP handler qmp_object_add() and the implementation of --object in qemu-storage-daemon can share most of the code. Currently, qemu-storage-daemon calls qmp_object_add(), but this is not correct because different visitors need to be used.
As a first step towards a fix, make qmp_object_add() a wrapper around a new function user_creatable_add_dict() that can get an additional parameter. The handling of "props" is only required for compatibility and not required for the qemu-storage-daemon command line, so it stays in qmp_object_add().
--- include/qom/object_interfaces.h | 12 ++++++++++++ qom/object_interfaces.c | 27 +++++++++++++++++++++++++++ qom/qom-qmp-cmds.c | 24 +----------------------- 3 files changed, 40 insertions(+), 23 deletions(-)
include/qom/object_interfaces.h +12 -0
@@ -87,6 +87,18 @@ Object *user_creatable_add_type(const char *type, const char *id,const QDict *qdict, Visitor *v, Error **errp); +/** +* user_creatable_add_dict: +* @qdict: the object definition +* @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 +* @qdict. The object type is taken from the QDict key 'qom-type', its +* 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); +/** * user_creatable_add_opts: * @opts: the object definition
qom/object_interfaces.c +27 -0
@@ -6,6 +6,7 @@#include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" +#include "qapi/qobject-input-visitor.h" #include "qom/object_interfaces.h" #include "qemu/help_option.h" #include "qemu/module.h"
@@ -105,6 +106,32 @@ out:return obj; } +void user_creatable_add_dict (QDict *qdict,Error **errp) +{ +Visitor *v; +Object *obj; + g_autofree char *type = NULL; + g_autofree char *id = NULL; + + type =g_strdup (qdict_get_try_str (qdict,"qom-type" )); +if (!type) { +error_setg (errp,QERR_MISSING_PARAMETER ,"qom-type" ); +return ; + } +qdict_del (qdict,"qom-type" ); + + id =g_strdup (qdict_get_try_str (qdict,"id" )); +if (!id) { +error_setg (errp,QERR_MISSING_PARAMETER ,"id" ); +return ; + } +qdict_del (qdict,"id" ); + + v =qobject_input_visitor_new (QOBJECT (qdict)); + obj =user_creatable_add_type (type, id, qdict, v, errp); +visit_free (v); +object_unref (obj); +}Object *user_creatable_add_opts (QemuOpts *opts,Error **errp) {
qom/qom-qmp-cmds.c +1 -23
@@ -21,7 +21,6 @@#include "qapi/qapi-commands-qom.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qobject-input-visitor.h" #include "qemu/cutils.h" #include "qom/object_interfaces.h" #include "qom/qom-qobject.h"
@@ -245,24 +244,6 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp) {QObject *props;QDict *pdict; -Visitor *v; -Object *obj; - g_autofree char *type = NULL; - g_autofree char *id = NULL; - - type =g_strdup (qdict_get_try_str (qdict,"qom-type" )); -if (!type) { -error_setg (errp,QERR_MISSING_PARAMETER ,"qom-type" ); -return ; - } -qdict_del (qdict,"qom-type" ); - - id =g_strdup (qdict_get_try_str (qdict,"id" )); -if (!id) { -error_setg (errp,QERR_MISSING_PARAMETER ,"id" ); -return ; - } -qdict_del (qdict,"id" ); props =qdict_get (qdict,"props" );if (props) {
@@ -282,10 +263,7 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)qobject_unref (pdict); } - v =qobject_input_visitor_new (QOBJECT (qdict)); - obj =user_creatable_add_type (type, id, qdict, v, errp); -visit_free (v); -object_unref (obj); +user_creatable_add_dict (qdict, errp); }void qmp_object_del (const char *id,Error **errp)
Signature · 1 line
2.20.1
PATCH 2/2 qemu-storage-daemon: Fix non-string --object properties
In reply to Kevin WolfAfter 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.
--- include/qom/object_interfaces.h | 6 +++++- qemu-storage-daemon.c | 4 +--- qom/object_interfaces.c | 8 ++++++-- qom/qom-qmp-cmds.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-)
include/qom/object_interfaces.h +5 -1
@@ -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:
qemu-storage-daemon.c +1 -3
@@ -278,7 +278,6 @@ static void process_options(int argc, char *argv[])QemuOpts *opts;const char *type;QDict *args; -QObject *ret_data =NULL ;/* FIXME The keyval parser rejects 'help' arguments, so we must * unconditionall try QemuOpts first. */
@@ -291,9 +290,8 @@ static void process_options(int argc, char *argv[])qemu_opts_del (opts); args =keyval_parse (optarg,"qom-type" , &error_fatal); -qmp_object_add (args, &ret_data, &error_fatal); +user_creatable_add_dict (args, true, &error_fatal);qobject_unref (args); -qobject_unref (ret_data);break ; }default :
qom/object_interfaces.c +6 -2
@@ -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);
qom/qom-qmp-cmds.c +1 -1
@@ -263,7 +263,7 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)qobject_unref (pdict); } -user_creatable_add_dict (qdict, errp); +user_creatable_add_dict (qdict, false, errp); }void qmp_object_del (const char *id,Error **errp)
Signature · 1 line
2.20.1