From nobody Mon Feb 9 08:11:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606739322; cv=none; d=zohomail.com; s=zohoarc; b=Ui9HNifhtfMhueoJx1MbcMqG50R0sZJz4g7bVvrGOhD300qRjjZSehcefByH3FXHjP6GQ+L+e4JM/rIZZMpIwSNQykiqZ4UhkIK0FQU9UgRjZ343ipzhQD0YtRTNMVYK2VYGg5Lw3opyn/c7kQeyGsZKcZCa+6ZOCCdPMeXKkW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606739322; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AbKP+CG/rBlp3SyuVEM2fY1PjIJ86EP1EQwvMGjWHd4=; b=VeGNPwsAZjAvICqZPUTmGTm1GkG5A6Wg2tu306JpRYhIz8QdoGoZ6+UMltzr7xfmuPOq3+9ceVCvfCz5wewT2396CGGl1VCsVrD1nk8zl+C3HC5Q7jTEkvpXD4UB3qa2iZgTX37F18xNAioGWgQLu4eDInuatQeVswD9uQxt0v4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606739322423280.50890494351995; Mon, 30 Nov 2020 04:28:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-5UGYgCC6NKCJOHvFp4sZaQ-1; Mon, 30 Nov 2020 07:28:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 13FEB8042AA; Mon, 30 Nov 2020 12:28:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE7365F70B; Mon, 30 Nov 2020 12:28:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 75B085002C; Mon, 30 Nov 2020 12:28:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AUCSV4c001827 for ; Mon, 30 Nov 2020 07:28:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id CCDCE27C23; Mon, 30 Nov 2020 12:28:31 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-117.ams2.redhat.com [10.36.114.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBB17277C5; Mon, 30 Nov 2020 12:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606739321; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AbKP+CG/rBlp3SyuVEM2fY1PjIJ86EP1EQwvMGjWHd4=; b=RwVM6aJbID7eMSBcjd8yU2+Zs2QibDfGQh8OqmrVlsdovcJZ12VUgTj4O2IkIl9RP/g4Wa kE4/edNAhBkZG/xZV4gL33ybbklpC/kS2H/arFo94xRsI62FVzEzZ3oK/BWPYRwjC2Q+Rp 317CHFrMYU7+jwIRywUh3eylyFM0f1E= X-MC-Unique: 5UGYgCC6NKCJOHvFp4sZaQ-1 From: Kevin Wolf To: qemu-devel@nongnu.org Subject: [PATCH 17/18] qapi/qom: Drop deprecated 'props' from object-add Date: Mon, 30 Nov 2020 13:25:37 +0100 Message-Id: <20201130122538.27674-18-kwolf@redhat.com> In-Reply-To: <20201130122538.27674-1-kwolf@redhat.com> References: <20201130122538.27674-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: kwolf@redhat.com, lvivier@redhat.com, thuth@redhat.com, pkrempa@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, libvir-list@redhat.com, jasowang@redhat.com, mreitz@redhat.com, kraxel@redhat.com, pbonzini@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The option has been deprecated in QEMU 5.0, remove it. Signed-off-by: Kevin Wolf --- qapi/qom.json | 6 +----- docs/system/deprecated.rst | 10 +++++----- qom/qom-qmp-cmds.c | 21 --------------------- 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/qapi/qom.json b/qapi/qom.json index 29b229394e..7e0d26a728 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -813,10 +813,6 @@ # # @id: the name of the new object # -# @props: a dictionary of properties to be passed to the backend. Deprecat= ed -# since 5.0, specify the properties on the top level instead. It i= s an -# error to specify the same option both on the top level and in @p= rops. -# # Additional arguments depend on qom-type and are passed to the backend # unchanged. # @@ -834,7 +830,7 @@ # ## { '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 =20 ## diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 04e41254f9..e6043799a4 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -224,11 +224,6 @@ Use ``migrate-set-parameters`` and ``query-migrate-par= ameters`` instead. =20 Use arguments ``base-node`` and ``top-node`` instead. =20 -``object-add`` option ``props`` (since 5.0) -''''''''''''''''''''''''''''''''''''''''''' - -Specify the properties for the object as top-level arguments instead. - ``query-named-block-nodes`` and ``query-block`` result dirty-bitmaps[i].st= atus (since 4.0) ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''= '''''''''''''''' =20 @@ -558,6 +553,11 @@ are automatically loaded from qcow2 images. Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``. See documentation of ``query-hotpluggable-cpus`` for additional details. =20 +``object-add`` option ``props`` (removed in 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''' + +Specify the properties for the object as top-level arguments instead. + Human Monitor Protocol (HMP) commands ------------------------------------- =20 diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index 310ab2d048..0e7d7247fc 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -243,27 +243,6 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const = char *typename, =20 void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp) { - QObject *props; - QDict *pdict; - - props =3D qdict_get(qdict, "props"); - if (props) { - pdict =3D 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) !=3D 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); } =20 --=20 2.28.0