From nobody Mon Mar 23 23:24:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774279329; cv=none; d=zohomail.com; s=zohoarc; b=Gb+ME14GCBi4M/naa6wHRhFlvUt2TnKauIB3hvCsA822QXveSeecoeUFQd6vNy4iLksuY8Xup/BNFBQ2juRcW+ilYqYWlkqsg7M0nEeA3a9xHU6r6BqwAbHJeeiJHVeqfyLrpZSzxRStA9Hg7yY3G+OKGWkjuO9iBD6SfRTe2wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774279329; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=xwSg4574/35tZ7ThVUYhoIp0tLBiIgRYgkQ3PdO9EJY=; b=HS3O+w0kJqTd07xogM8tVjtOUE6U1pWjShzSEdDc17EVIXkJ8+mqYRBDxzbbcFT4V4RUkGWDHPmHGEhGmx/p58BCCRZaHxqaKiMQU+BH2GSTa5kGFwXH59kR5zga5MlWbRUMrkcyCvuz/hU3zFns7rv2ZPQnpPIQjuH9IDQvfz0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1774279329439254.68241906384503; Mon, 23 Mar 2026 08:22:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 995A13F32C; Mon, 23 Mar 2026 11:22:08 -0400 (EDT) Received: from [172.19.199.12] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7BAE43F8A5; Mon, 23 Mar 2026 11:21:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6D57F3F292; Mon, 23 Mar 2026 11:21:28 -0400 (EDT) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B70993F280 for ; Mon, 23 Mar 2026 11:21:27 -0400 (EDT) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-487012ce896so1524235e9.0 for ; Mon, 23 Mar 2026 08:21:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486fe032a55sm551025315e9.7.2026.03.23.08.21.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 23 Mar 2026 08:21:25 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,HELO_MISC_IP, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774279286; x=1774884086; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xwSg4574/35tZ7ThVUYhoIp0tLBiIgRYgkQ3PdO9EJY=; b=Y87dtlbyZWCEKxB7Bcak3BWBHlaQYYcT6kunl4VYoFxRwJnOFpYDRiRo4UIM+lVBYD S+pqLlQcmIj1q1dmvIQpLiLD8kUDg2tO4V+71DJUkMLgzzo+4uAd8ss7GZQGVJgAFlX0 eKIaD3QhTvL15yUI2C1voGGXkIx7AGOca/8fbiKuMp/om4czvTxD08hwIX9JwuUp+kOY oayRX7zuQssSwe1XTn6rkfA3fAqZFOp2DVVf7cgvTBMVQsxzgCjRyWZzz+8Nm4+5Q3wP l47CkFhEnmaS02MfuASgVlzJ5H3t0Xd79iZUsPmHf0sc/kRf10DrqEkBOwhm69Nonu0K glNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774279286; x=1774884086; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=xwSg4574/35tZ7ThVUYhoIp0tLBiIgRYgkQ3PdO9EJY=; b=W+TPfk+G3DGxGz7xP052udHipRwjsYOdRc3rkgwKPYe0r8HxBuzCAMBnZau1P7bUA8 PsL2f5phrhuE0+aD5rgA4obQlD8V3Nnr6jiY+/bbybbJLGUQfMIQOLNUh6sbo6JBI5kI 2pCjJ/eQfkPoIwLN1m5gldw55JEeU7iZ0Ch7jB303xbBl1fIENVwzgjZvUfEu7YbUm+Y LrLDHa6PDZqVnZGBqYTham4hMFHzT8lzFP9AGwdlTTnWrqtG/OIY0n0InbOGq+FoQOkX l4x8xS1tYet2A4q8+uaSz30KHrLYaB9KX4DFyrPKDWMbuT8NwcxEeIy/EH0sYhWjj96Q sDjQ== X-Forwarded-Encrypted: i=1; AJvYcCXGEre0A/gRRMh4WRUY+pBamfQwu19q57PcTm+rp31PlrwFO1Ux9M/uwQ7vNquZc+gt/D1FkA==@lists.libvirt.org X-Gm-Message-State: AOJu0Yym+f5Vi13QuQjiI+WPQapeVUJ2/YzOZB6sJv+Np6WMxwOdODYJ RTWgO6DRGS9IyyYYUAlwLYLAc3WJVXGs9qCdlIf6t5S6sfYcR3AR12Ly0Lm6WwaSDec= X-Gm-Gg: ATEYQzwd1f/vJ4u8nS06eErSRvqlpR+b/PCOGtxFm7UglsR28WQlWH407k1GZcPoFtp lbuF0XNMhKkAEYcmPwQNP6gh7+imx2vL2G4iEnzGruBkl9pDPyXssot4W+FsTW6P3YfuLLkiV/e yaehPyoHXrriCsqqPbdqC7PoD/r1E9MsVLMZQojiQZztzhldJL6+E8Rse2cClZWVn51ihyBD9V6 xDQ9D/ejKLFdYEJawoC2Xfj5ujV3wFBPTOY0UqUglm/SpjmLZj4V9gPy/o21L4KUz7K9gLXU2Mx T18snp2lGlNK2DTLSsdNpiPKgGVfcPl2FA+mLMzy6wiqieRDDsppRYZ2XjSpWS0JtPg2jMJjV02 VgormWXY6aaNQVQyhF76BFUvkFmoJUhaZFdSHqiJWJ71/rkCOOZsd05ePetnu1TCa4wxOC4HwC3 ai2ynFMtbnfPA+ievL/AdPGbLvQ3PtIFaETyorZF/bJvR2wTUuoRjbus7k9FTCacvAQZJ+oM16y SE9LHA6eJU= X-Received: by 2002:a05:600c:3f1b:b0:487:59c:2bb8 with SMTP id 5b1f17b1804b1-487059c2eb3mr92067465e9.27.1774279286256; Mon, 23 Mar 2026 08:21:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-11.0] qapi: Remove deprecated SchemaInfoEnumMember::values field Date: Mon, 23 Mar 2026 16:21:24 +0100 Message-ID: <20260323152124.93051-1-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4ZW3R3PKG4KHMW7K6JVLCPFWX3CNFIWK X-Message-ID-Hash: 4ZW3R3PKG4KHMW7K6JVLCPFWX3CNFIWK X-MailFrom: philmd@linaro.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Eric Blake , Pierrick Bouvier , Michael Roth , devel@lists.libvirt.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774279331986154100 SchemaInfoEnumMember::values field has been deprecated for more than 5 years (see commit 75ecee72625 "qapi: Enable enum member introspection to show more than name"), it should be safe enough to remove. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ qapi/introspect.json | 12 +----------- scripts/qapi/introspect.py | 3 +-- 4 files changed, 9 insertions(+), 19 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index a6d6a713265..afb0d383c27 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -101,12 +101,6 @@ Use the more generic commands ``block-export-add`` and= ``block-export-del`` instead. As part of this deprecation, where ``nbd-server-add`` used a single ``bitmap``, the new ``block-export-add`` uses a list of ``bitmaps``. =20 -``query-qmp-schema`` return value member ``values`` (since 6.2) -''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Member ``values`` in return value elements with meta-type ``enum`` is -deprecated. Use ``members`` instead. - ``drive-backup`` (since 6.2) '''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index e75db084108..9eb4ef67ff4 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -787,6 +787,13 @@ $VM,debug-threads=3Don`` instead. =20 This argument has always been ignored. =20 +``query-qmp-schema`` return value member ``values`` (removed in 11.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Member ``values`` in return value elements with meta-type ``enum`` has +been replaced by ``members`` instead. + + QEMU Machine Protocol (QMP) events ---------------------------------- =20 diff --git a/qapi/introspect.json b/qapi/introspect.json index c8432c8ed8e..71b10baabaf 100644 --- a/qapi/introspect.json +++ b/qapi/introspect.json @@ -159,22 +159,12 @@ # @members: the enum type's members, in no particular order. # (since 6.2) # -# @values: the enumeration type's member names, in no particular -# order. Redundant with @members. Just for backward -# compatibility. -# -# Features: -# -# @deprecated: Member @values is deprecated. Use @members instead. -# # Values of this type are JSON string on the wire. # # Since: 2.5 ## { 'struct': 'SchemaInfoEnum', - 'data': { 'members': [ 'SchemaInfoEnumMember' ], - 'values': { 'type': [ 'str' ], - 'features': [ 'deprecated' ] } } } + 'data': { 'members': [ 'SchemaInfoEnumMember' ] } } =20 ## # @SchemaInfoEnumMember: diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 7e28de2279a..daeb3d77b23 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -318,8 +318,7 @@ def visit_enum_type(self, name: str, info: Optional[QAP= ISourceInfo], prefix: Optional[str]) -> None: self._gen_tree( name, 'enum', - {'members': [self._gen_enum_member(m) for m in members], - 'values': [Annotated(m.name, m.ifcond) for m in members]}, + {'members': [self._gen_enum_member(m) for m in members]}, ifcond, features ) =20 --=20 2.53.0