ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kevin Wolf 2020-11-27 18:11:02 +01:00
parent 9695c3af3a
commit 5024340745
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/system/deprecated.rst
View File

@ -186,11 +186,6 @@ Use argument value ``null`` instead.
Use arguments ``base-node`` and ``top-node`` instead. Use arguments ``base-node`` and ``top-node`` instead.
``object-add`` option ``props`` (since 5.0)
'''''''''''''''''''''''''''''''''''''''''''
Specify the properties for the object as top-level arguments instead.
``nbd-server-add`` and ``nbd-server-remove`` (since 5.2) ``nbd-server-add`` and ``nbd-server-remove`` (since 5.2)
'''''''''''''''''''''''''''''''''''''''''''''''''''''''' ''''''''''''''''''''''''''''''''''''''''''''''''''''''''

5
docs/system/removed-features.rst
View File

@ -143,6 +143,11 @@ field of the ``BlockDeviceInfo`` struct should be used instead, which is the
type of the ``inserted`` field in query-block replies, as well as the type of the ``inserted`` field in query-block replies, as well as the
type of array items in query-named-block-nodes. type of array items in query-named-block-nodes.
``object-add`` option ``props`` (removed in 6.0)
''''''''''''''''''''''''''''''''''''''''''''''''
Specify the properties for the object as top-level arguments instead.
Human Monitor Protocol (HMP) commands Human Monitor Protocol (HMP) commands
------------------------------------- -------------------------------------

6
qapi/qom.json
View File

@ -211,10 +211,6 @@
# #
# @id: the name of the new object # @id: the name of the new object
# #
# @props: a dictionary of properties to be passed to the backend. Deprecated
# since 5.0, specify the properties on the top level instead. It is an
# error to specify the same option both on the top level and in @props.
#
# Additional arguments depend on qom-type and are passed to the backend # Additional arguments depend on qom-type and are passed to the backend
# unchanged. # unchanged.
# #
@ -232,7 +228,7 @@
# #
## ##
{ 'command': 'object-add', { 'command': 'object-add',
'data': {'qom-type': 'str', 'id': 'str', '*props': 'any'}, 'data': {'qom-type': 'str', 'id': 'str'},
'gen': false } # so we can get the additional arguments 'gen': false } # so we can get the additional arguments
## ##

21
qom/qom-qmp-cmds.c
View File

@ -225,27 +225,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp) 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); user_creatable_add_dict(qdict, false, errp);
} }