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>
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index a003796..6517212 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -90,6 +90,10 @@
/**
* 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 @@
* 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:
diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c
index dd12897..9e7adfe 100644
--- a/qemu-storage-daemon.c
+++ b/qemu-storage-daemon.c
@@ -278,7 +278,6 @@
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 @@
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:
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 739e3e5..bc36f96 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -106,7 +106,7 @@
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 @@
}
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);
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index 35db44b..c5249e4 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -263,7 +263,7 @@
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)
