* [PATCH 0/2] qemu-storage-daemon: Fix non-string --object properties
@ 2020-04-16 15:34 Kevin Wolf
2020-04-16 15:34 ` [PATCH 1/2] qom: Factor out user_creatable_add_dict() Kevin Wolf
2020-04-16 15:34 ` [PATCH 2/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
0 siblings, 2 replies; 3+ messages in thread
From: Kevin Wolf @ 2020-04-16 15:34 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel, armbru, coiby.xu, mreitz
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(-)
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] qom: Factor out user_creatable_add_dict()
2020-04-16 15:34 [PATCH 0/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
@ 2020-04-16 15:34 ` Kevin Wolf
2020-04-16 15:34 ` [PATCH 2/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2020-04-16 15:34 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel, armbru, coiby.xu, mreitz
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().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/qom/object_interfaces.h | 12 ++++++++++++
qom/object_interfaces.c | 27 +++++++++++++++++++++++++++
qom/qom-qmp-cmds.c | 24 +-----------------------
3 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index 6f92f3cebb..a0037968a4 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -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
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 72cb9e32a9..739e3e5172 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -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)
{
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index e47ebe8ed1..35db44b50e 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -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)
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] qemu-storage-daemon: Fix non-string --object properties
2020-04-16 15:34 [PATCH 0/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
2020-04-16 15:34 ` [PATCH 1/2] qom: Factor out user_creatable_add_dict() Kevin Wolf
@ 2020-04-16 15:34 ` Kevin Wolf
1 sibling, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2020-04-16 15:34 UTC (permalink / raw)
To: qemu-block; +Cc: kwolf, qemu-devel, armbru, coiby.xu, mreitz
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>
---
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(-)
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:
diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c
index dd128978cc..9e7adfe3a6 100644
--- a/qemu-storage-daemon.c
+++ b/qemu-storage-daemon.c
@@ -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:
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);
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index 35db44b50e..c5249e44d0 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -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)
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-16 15:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-16 15:34 [PATCH 0/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
2020-04-16 15:34 ` [PATCH 1/2] qom: Factor out user_creatable_add_dict() Kevin Wolf
2020-04-16 15:34 ` [PATCH 2/2] qemu-storage-daemon: Fix non-string --object properties Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).