[PATCH v2 22/31] qom: Remove user_creatable_add_dict()
This function is now unused and can be removed.
Signed-off-by: Kevin Wolf <kwolf(a)redhat.com>
---
include/qom/object_interfaces.h | 18 ------------------
qom/object_interfaces.c | 32 --------------------------------
2 files changed, 50 deletions(-)
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index 9b9938b8c0..5299603f50 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -86,24 +86,6 @@ 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
- * @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
- * @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.
- *
- * Returns: %true on success, %false on failure.
- */
-bool user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp);
-
/**
* user_creatable_add_opts:
* @opts: the object definition
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index b9a99c8bf4..7d8a4b77b8 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -104,38 +104,6 @@ out:
return obj;
}
-bool user_creatable_add_dict(QDict *qdict, bool keyval, 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 false;
- }
- qdict_del(qdict, "qom-type");
-
- id = g_strdup(qdict_get_try_str(qdict, "id"));
- if (!id) {
- error_setg(errp, QERR_MISSING_PARAMETER, "id");
- return false;
- }
- qdict_del(qdict, "id");
-
- 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);
- return !!obj;
-}
-
Object *user_creatable_add_opts(QemuOpts *opts, Error **errp)
{
Visitor *v;
--
2.29.2