summaryrefslogtreecommitdiffstats
path: root/qom
diff options
context:
space:
mode:
authorKevin Wolf2020-11-27 18:11:02 +0100
committerKevin Wolf2021-03-19 10:17:12 +0100
commit50243407457a9fb0ed17b9a9ba9fc9aee09495b1 (patch)
treeeb3b4e13cfd7003b7248f33ca304f0d3dad760ce /qom
parenttests: Drop 'props' from object-add calls (diff)
downloadqemu-50243407457a9fb0ed17b9a9ba9fc9aee09495b1.tar.gz
qemu-50243407457a9fb0ed17b9a9ba9fc9aee09495b1.tar.xz
qemu-50243407457a9fb0ed17b9a9ba9fc9aee09495b1.zip
qapi/qom: Drop deprecated 'props' from object-add
The option has been deprecated in QEMU 5.0, remove it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qom')
-rw-r--r--qom/qom-qmp-cmds.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index b40ac39f30..19fd5e117f 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -225,27 +225,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
{
- QObject *props;
- QDict *pdict;
-
- props = qdict_get(qdict, "props");
- if (props) {
- pdict = qobject_to(QDict, props);
- if (!pdict) {
- error_setg(errp, QERR_INVALID_PARAMETER_TYPE, "props", "dict");
- return;
- }
- qobject_ref(pdict);
- qdict_del(qdict, "props");
- qdict_join(qdict, pdict, false);
- if (qdict_size(pdict) != 0) {
- error_setg(errp, "Option in 'props' conflicts with top level");
- qobject_unref(pdict);
- return;
- }
- qobject_unref(pdict);
- }
-
user_creatable_add_dict(qdict, false, errp);
}