From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25231606A31C for ; Wed, 18 Nov 2026 18:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OJfEkGDf Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xTkGV-0007QO-GQ; Wed, 18 Nov 2026 13:20:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xTkGT-0007Q5-CH for qemu-devel@nongnu.org; Wed, 18 Nov 2026 13:20:13 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xTkGR-0002Sx-Ox for qemu-devel@nongnu.org; Wed, 18 Nov 2026 13:20:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1795026010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RxjOJ7W/d/7XYZ7ys+J8UiC5f9umlptb/srrnp3bBWs=; b=OJfEkGDf6gEnHo2oXD5ch+VMjRL1SjesUDbLV3q2q0A8cOEmplGauM/KqEk7rBR11TYQyR 6WxIYJXJ6IrCMWfYQONY4wLsHowQ1X15DzKMMFNMDNk6oFGNfsImPSsomM9s356BEYz1c1 X5xn4KAdnrZBLwvOkX3ygNp5ZjsGJUo= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-315-ilHBgiaGPtOaFPFlrQeZ-w-1; Wed, 18 Nov 2026 13:20:08 -0500 X-MC-Unique: ilHBgiaGPtOaFPFlrQeZ-w-1 X-Mimecast-MFC-AGG-ID: ilHBgiaGPtOaFPFlrQeZ-w_1795026008 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 03DF218004BB for ; Wed, 18 Nov 2026 18:20:08 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B204130000E8 for ; Wed, 18 Nov 2026 18:20:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2D0BD21E6A04; Wed, 18 Nov 2026 19:20:05 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, crosa@redhat.com, marcandre.lureau@redhat.com Subject: [PATCH] python/qemu: Don't choke on unknown members in QMP replies Date: Wed, 18 Nov 2026 19:20:05 +0100 Message-ID: <20261118182005.1066151-1-armbru@redhat.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 The recent addition of @qapi-type to ObjectPropertyInfo and ObjectPropertyValue broke the corresponding classes in qemu/utils/qom_common. Reproducer: $ bld/run qom-list -s qmp-socket /chardevs Traceback (most recent call last): File "/work/armbru/qemu/bld/pyvenv/bin/qom-list", line 8, in sys.exit(QOMList.entry_point()) ~~~~~~~~~~~~~~~~~~~^^ File "/work/armbru/qemu/python/qemu/utils/qom_common.py", line 230, in entry_point return cls.command_runner(args) ~~~~~~~~~~~~~~~~~~^^^^^^ File "/work/armbru/qemu/python/qemu/utils/qom_common.py", line 215, in command_runner return cmd.run() ~~~~~~~^^ File "/work/armbru/qemu/python/qemu/utils/qom.py", line 179, in run rsp = self.qom_list(self.path) File "/work/armbru/qemu/python/qemu/utils/qom_common.py", line 192, in qom_list return [ObjectPropertyInfo.make(x) for x in rsp] ~~~~~~~~~~~~~~~~~~~~~~~^^^ File "/work/armbru/qemu/python/qemu/utils/qom_common.py", line 52, in make assert value.keys() <= {'name', 'type', 'description', 'default-value'} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ AssertionError This asserts "no members we don't know". There are two more like it. Adding @qapi-type broke them. docs/devel/qapi-code-gen.rst section "Compatibility considerations" stipulates that "clients are expected to ignore [members] they don't know." Delete / relax these assertions. Fixes: 0eee31cf1085 ("qapi/qom: add qapi-type to qom-list, qom-list-properties, qom-list-get") Fixes: c750c02891a8 ("python/qmp: Add qom script rewrites") Signed-off-by: Markus Armbruster --- python/qemu/utils/qom_common.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python/qemu/utils/qom_common.py b/python/qemu/utils/qom_common.py index ab21a4d364a..e5bae1c7421 100644 --- a/python/qemu/utils/qom_common.py +++ b/python/qemu/utils/qom_common.py @@ -49,7 +49,6 @@ def make(cls, value: Dict[str, Any]) -> 'ObjectPropertyInfo': Build an ObjectPropertyInfo from a Dict with an unknown shape. """ assert value.keys() >= {'name', 'type'} - assert value.keys() <= {'name', 'type', 'description', 'default-value'} return cls(value['name'], value['type'], value.get('description'), value.get('default-value')) @@ -80,7 +79,6 @@ def make(cls, value: Dict[str, Any]) -> 'ObjectPropertyValue': Build an ObjectPropertyValue from a Dict with an unknown shape. """ assert value.keys() >= {'name', 'type'} - assert value.keys() <= {'name', 'type', 'value'} return cls(value['name'], value['type'], value.get('value')) @property @@ -103,7 +101,7 @@ def make(cls, value: Dict[str, Any]) -> 'ObjectPropertiesValues': """ Build an ObjectPropertiesValues from a Dict with an unknown shape. """ - assert value.keys() == {'properties'} + assert value.keys() <= {'properties'} props = [ObjectPropertyValue(item['name'], item['type'], item.get('value')) -- 2.55.0