From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674429; cv=none; d=zohomail.com; s=zohoarc; b=EnyBI8LSLGl/MDuFT7uP4Ro/FrS9lHI1+lvkrdaMchFlVZu2zOiJJaFCT6qPgaQtQDJCjn26olpFeRwuNMXXoNc/tykNHR4DuJdXFAiU7bD8NDaMZ74pbrAeS3h7WxOoe2znCUYOFd+Vniygzwd9FupJ6UiKSRGMvtli0W/kINA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674429; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6rV63i5zLz4J/LUzf54w3p9IiUX+skDQOv9c6EGZuIE=; b=lbBDwesddrubBrc77FHQ9XvI1vIOD2G3gTC2DGFyti55jcbmK2CsvWkxQMMeL6hv+zCo5UJMWaUemnYqiVp9JbRmwWgsieZH8aysi3cnIFYDwmV01t+NJ23ZegwhZpJdCbOcVRWzdRRRnsUGTwKLbB+umHZ8jnzz0aggsPN2ZbE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674429504635.0925530725302; Thu, 17 Sep 2026 12:47:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4B-0005mo-1E; Thu, 17 Sep 2026 15:46:43 -0400 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 1x7I40-0005kS-NP for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7I3z-0005Cq-7P for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:32 -0400 Received: from mx-prod-mc-08.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-280-PdhAthoqOdWjbpDEjjtTlQ-1; Thu, 17 Sep 2026 15:46:25 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F290418052DA; Thu, 17 Sep 2026 19:46:22 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2BD3D19AC048; Thu, 17 Sep 2026 19:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674389; 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: in-reply-to:in-reply-to:references:references; bh=6rV63i5zLz4J/LUzf54w3p9IiUX+skDQOv9c6EGZuIE=; b=Z4PKwbHUZd95N6N7xzbDKkv3fYp/KY9O8roncYx3rkRpM+bnBfgLpACYoXbEERYN59zBNu C2xXs/fCwDFpHgqWwa3R+IiuZAszV4hPYXXVDByLL9X2Q9I5QK8q5WTgE46z1rpyqFWsDk T7IpBmygn/rO8XcxVgUnijwkriRz9no= X-MC-Unique: PdhAthoqOdWjbpDEjjtTlQ-1 X-Mimecast-MFC-AGG-ID: PdhAthoqOdWjbpDEjjtTlQ_1789674383 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 1/7] qapi: convert remaining simple intros for block-export.json Date: Thu, 17 Sep 2026 15:46:08 -0400 Message-ID: <20260917194614.549584-2-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674431120158500 Content-Type: text/plain; charset="utf-8" These are either structs or unions that are used in an inlinable context: i.e. the generated documentation is likely to feature a version of this documentation block that does not include the intro in context of another command, event, or structure. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- qapi/block-export.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/qapi/block-export.json b/qapi/block-export.json index 2893c6456d5..e9f7e72c8ee 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -37,10 +37,9 @@ =20 ## # @NbdServerOptions: -# -# Keep this type consistent with the `NbdServerOptionsLegacy` type. -# The only intended difference is using `SocketAddress` instead of -# `SocketAddressLegacy`. +# Keep this type consistent with the `NbdServerOptionsLegacy` +# type. The only intended difference is using `SocketAddress` +# instead of `SocketAddressLegacy`. # # @addr: Address on which to listen (since 4.2). ## @@ -50,10 +49,9 @@ =20 ## # @NbdServerOptionsLegacy: -# -# Keep this type consistent with the `NbdServerOptions` type. The -# only intended difference is using `SocketAddressLegacy` instead of -# `SocketAddress`. +# Keep this type consistent with the `NbdServerOptions` type. The +# only intended difference is using `SocketAddressLegacy` instead +# of `SocketAddress`. # # @addr: Address on which to listen (since 1.3). ## @@ -339,9 +337,8 @@ =20 ## # @BlockExportOptions: -# -# Describes a block export, i.e. how single node should be exported on -# an external interface. +# Describes a block export, i.e. how single node should be +# exported on an external interface. # # @type: Block export type # --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674491; cv=none; d=zohomail.com; s=zohoarc; b=C4klEyU8Ei96Kr5dCIiOUjPzK17efdFlUcQYnH3E4UMqQSFIJAAGeRGyCGVnTwaruyfk5hOwRXGWpDe1Yw7hnE1Jv10do+9Vsxg3YAwH6Csn+UWU7rGJz0eAaIHhzbdzNQ5piGt2+hPP+KLPc0Vg6afsTqPOMMj92W4uAxrTk9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674491; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ClPV5sIPWojjTAynGwc1mftqvUQ/Gr/l3qbEvnYoawE=; b=Pd/+kx5sayzLggGL2bo7i55CbbngTZfAWRxfA+eQruVNlNgQXkGwwLLhAAPTOhJ7mNOl8ySQLaK7SPJO81Z04nMehOtlUwvalHojjW0L+OKtG5n4lOnh4gwh0Z7YBF8WPNmiDCx61vDFIcdJ9KsqEevRK0W+pLNb40sCYfb+VeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674491862894.8948584053924; Thu, 17 Sep 2026 12:48:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4A-0005mc-Uf; Thu, 17 Sep 2026 15:46:42 -0400 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 1x7I42-0005l1-MT for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7I41-0005DY-5S for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:34 -0400 Received: from mx-prod-mc-08.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-654-kF7sXa3VNxm8FKNkD_5-hA-1; Thu, 17 Sep 2026 15:46:28 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 142D61912C44; Thu, 17 Sep 2026 19:46:26 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3747019AC047; Thu, 17 Sep 2026 19:46:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674392; 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: in-reply-to:in-reply-to:references:references; bh=ClPV5sIPWojjTAynGwc1mftqvUQ/Gr/l3qbEvnYoawE=; b=XKxrI2a7LJClhAaJ7ifUNmtKIqZpidYcLyfHecCmjvd8efc4rm7NKS8AsfMJi0ccBhTg1c RtwPQ2Niix4w2R6Wf6tXocEEZy/eK2b2ffuWdFWHGjEZg3YxvK1zJsPZbcmPgfeKiPYOOm qx8CAWxIm8Ogyb52GVzWXdy1LhM0HCI= X-MC-Unique: kF7sXa3VNxm8FKNkD_5-hA-1 X-Mimecast-MFC-AGG-ID: kF7sXa3VNxm8FKNkD_5-hA_1789674386 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 2/7] qapi: convert remaining simple intros for cxl.json Date: Thu, 17 Sep 2026 15:46:09 -0400 Message-ID: <20260917194614.549584-3-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674493139158500 Content-Type: text/plain; charset="utf-8" These are either structs or unions that are used in an inlinable context: i.e. the generated documentation is likely to feature a version of this documentation block that does not include the intro in context of another command, event, or structure. Signed-off-by: John Snow Reviewed-by: Jonathan Cameron Reviewed-by: Markus Armbruster --- qapi/cxl.json | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/qapi/cxl.json b/qapi/cxl.json index 631d4def2ac..9422d5a0e2d 100644 --- a/qapi/cxl.json +++ b/qapi/cxl.json @@ -32,9 +32,8 @@ =20 ## # @CXLCommonEventBase: -# -# Common event base for a CXL Event (CXL r3.2 8.2.10.2.1 -# Table 8-55 Common Event Record Format). +# Common event base for a CXL Event (CXL r3.2 8.2.10.2.1 Table +# 8-55 Common Event Record Format). # # @path: CXL type 3 device canonical QOM path # @@ -63,8 +62,7 @@ =20 ## # @CXLGeneralMediaEvent: -# -# Event record for a General Media Event (CXL r3.2 8.2.10.2.1.1). +# Event record for a General Media Event (CXL r3.2 8.2.10.2.1.1). # # @dpa: Device Physical Address (relative to @path device). Note # lower bits include some flags. See CXL r3.2 Table 8-57 General @@ -129,8 +127,7 @@ =20 ## # @CXLDRAMEvent: -# -# Event record for a DRAM Event (CXL r3.2 8.2.10.2.1.2). +# Event record for a DRAM Event (CXL r3.2 8.2.10.2.1.2). # # @dpa: Device Physical Address (relative to @path device). Note # lower bits include some flags. See CXL r3.2 Table 8-58 DRAM @@ -211,8 +208,7 @@ =20 ## # @CXLMemModuleEvent: -# -# Event record for a Memory Module Event (CXL r3.2 8.2.10.2.1.3). +# Event record for a Memory Module Event (CXL r3.2 8.2.10.2.1.3). # # @type: Device Event Type. See CXL r3.2 Table 8-59 Memory Module # Event Record for bit definitions for bit definiions. --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674452; cv=none; d=zohomail.com; s=zohoarc; b=f1BcDFomhAgUy6MNhYJpLVcFjAViW87qrDPwl9UfufYTFgq4sI5oMmfM3aBkx2/SKGe9nURHVosfwocIWl/K0ebVO/+K0gbSerxJIKNMlwmpXhEXyPWPTHGc0fHLH+FeljQE6C55zotZRno+8cPX+RNEVKSsE+9L5Wi1yIyQcm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674452; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NKPSpHSAdUW0sNBcwRZtBbtyHQtLc8C/jg53CK8yBGQ=; b=CcDtGZK6ynbmNg8q+Y2C9GtOpDDcvnvjq5K9S8ZnbTaMQnwnSfHGVzaqNlZiJqbSBGITuQIU0eDK2AhFjvcGTl4TtQwD0gT0HZgborS+d9LT39jcSGvX/HlcJaXLXydChZYtVx5aMwmblLMUYJ7H7l/c+gSJ/1mrA/qi1MRqQ4A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674452121260.6165009409028; Thu, 17 Sep 2026 12:47:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4D-0005o7-KH; Thu, 17 Sep 2026 15:46:45 -0400 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 1x7I44-0005lV-UG for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:37 -0400 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 1x7I43-0005E1-Js for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:36 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-TM3mgJ4SOfGO3P_EUkG7TA-1; Thu, 17 Sep 2026 15:46:31 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 304EA1964CD4; Thu, 17 Sep 2026 19:46:29 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4AA0C19AC048; Thu, 17 Sep 2026 19:46:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674395; 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: in-reply-to:in-reply-to:references:references; bh=NKPSpHSAdUW0sNBcwRZtBbtyHQtLc8C/jg53CK8yBGQ=; b=RYP14CSqclivBxVZOsDqEVBUZYDOSw9RSoWRejth2FP1wKjBQQLOGPdxhqnsFBUqn7TCDY yR6cUsDEQsswFySM91Zs+tkJKLZvEr+cW5ZsMQ4M7/RmH9s5lUSu9+cxLQq0k0+StI2w5B Vpf/06swOsA7OL3j/F9IsUKGCYuOBUo= X-MC-Unique: TM3mgJ4SOfGO3P_EUkG7TA-1 X-Mimecast-MFC-AGG-ID: TM3mgJ4SOfGO3P_EUkG7TA_1789674389 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 3/7] qapi: convert remaining simple intros for machine.json Date: Thu, 17 Sep 2026 15:46:10 -0400 Message-ID: <20260917194614.549584-4-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674452976158501 Content-Type: text/plain; charset="utf-8" These are either structs or unions that are used in an inlinable context: i.e. the generated documentation is likely to feature a version of this documentation block that does not include the intro in context of another command, event, or structure. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- qapi/machine.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index f1f2c393824..a58e373dd70 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -449,8 +449,7 @@ =20 ## # @NumaOptions: -# -# A discriminated record of NUMA options. (for OptsVisitor) +# A discriminated record of NUMA options. (for OptsVisitor) # # @type: NUMA option type # --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674484; cv=none; d=zohomail.com; s=zohoarc; b=jhLYR0eNq8cevVV6NNCqYK9VhDdlOT+7QXpbC2uPGXWq45c9veQ/zdkxEtBUYzSRlo2kchrX90uvq63yZ7HkHoUFPUlgaukldj5+NLVS/TLc8C361+B0z/oceXldPIrlKD4ikAZXLi7cyg4ISDfEJgBsAmWXKDy0tJoaakdlYRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674484; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IiMHSbMYaSoCftUUaFNfoKY7hKh6/HrfQ1cDf7jEy/s=; b=WqJRAPWnJhY1FeYbUN0Gw2dzFnKJL/cGdMOV31wUdOq1TTVdj6n6U7KfcgyFzMfCFB34FrfNSzaZFT2Xx9fdU+1nKeiPdgRP47opAn75irYolrWRClbpiIPL4+T0nHFSCIo4KCx7YtoR6T7yAUzFVqKl/JqOsBGRRh+2DOnvnaw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674484232785.6562921605034; Thu, 17 Sep 2026 12:48:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4E-0005on-I9; Thu, 17 Sep 2026 15:46:46 -0400 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 1x7I46-0005lq-GQ for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:39 -0400 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 1x7I44-0005EE-TX for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:38 -0400 Received: from mx-prod-mc-08.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-685-t74_p71_NcGmyTQhXq5UZg-1; Thu, 17 Sep 2026 15:46:34 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 215A61912C63; Thu, 17 Sep 2026 19:46:32 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E8B819AC047; Thu, 17 Sep 2026 19:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674396; 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: in-reply-to:in-reply-to:references:references; bh=IiMHSbMYaSoCftUUaFNfoKY7hKh6/HrfQ1cDf7jEy/s=; b=hOoXcVerrr+KYhl1dZzAZErchECr7s0rAIduUJ2eJe3Fj4LI3bpnokH4TBVEyiaXAxZeYc 9h0lhZNVaSJQxT3BYC2LNFHkj0/Zwmbo65wxzQMT2pg5SFW6k0Qirg+/p0D6LqJqrwfZbT yOGoYlSQSkyTyG6ttVwRo3jTT9crtOE= X-MC-Unique: t74_p71_NcGmyTQhXq5UZg-1 X-Mimecast-MFC-AGG-ID: t74_p71_NcGmyTQhXq5UZg_1789674392 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 4/7] qapi: convert remaining simple intros for block-core.json Date: Thu, 17 Sep 2026 15:46:11 -0400 Message-ID: <20260917194614.549584-5-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674485198158500 Content-Type: text/plain; charset="utf-8" These are either structs or unions that are used in an inlinable context: i.e. the generated documentation is likely to feature a version of this documentation block that does not include the intro in context of another command, event, or structure. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- qapi/block-core.json | 45 +++++++++++++++++++------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index da7b5c7fe35..802a4af74ed 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4502,9 +4502,8 @@ =20 ## # @BlockdevOptionsCurlHttp: -# -# Driver specific block device options for HTTP connections over the -# curl backend. URLs must start with "http://". +# Driver specific block device options for HTTP connections over +# the curl backend. URLs must start with "http://". # # @cookie: List of cookies to set; format is "name1=3Dcontent1; # name2=3Dcontent2;" as explained by CURLOPT_COOKIE(3). Defaults to @@ -4528,9 +4527,8 @@ =20 ## # @BlockdevOptionsCurlHttps: -# -# Driver specific block device options for HTTPS connections over the -# curl backend. URLs must start with "https://". +# Driver specific block device options for HTTPS connections over +# the curl backend. URLs must start with "https://". # # @sslverify: Whether to verify the SSL certificate's validity # (defaults to true) @@ -4543,9 +4541,8 @@ =20 ## # @BlockdevOptionsCurlFtp: -# -# Driver specific block device options for FTP connections over the -# curl backend. URLs must start with "ftp://". +# Driver specific block device options for FTP connections over +# the curl backend. URLs must start with "ftp://". # # Since: 2.9 ## @@ -4555,9 +4552,8 @@ =20 ## # @BlockdevOptionsCurlFtps: -# -# Driver specific block device options for FTPS connections over the -# curl backend. URLs must start with "ftps://". +# Driver specific block device options for FTPS connections over +# the curl backend. URLs must start with "ftps://". # # @sslverify: Whether to verify the SSL certificate's validity # (defaults to true) @@ -4683,14 +4679,13 @@ =20 ## # @BlockdevOptionsCbw: -# -# Driver specific block device options for the copy-before-write -# driver, which does so called copy-before-write operations: when data -# is written to the filter, the filter first reads corresponding -# blocks from its file child and copies them to @target child. After -# successfully copying, the write request is propagated to file child. -# If copying fails, the original write request is failed too and no -# data is written to file child. +# Driver specific block device options for the copy-before-write +# driver, which does so called copy-before-write operations: when +# data is written to the filter, the filter first reads +# corresponding blocks from its file child and copies them to +# @target child. After successfully copying, the write request is +# propagated to file child. If copying fails, the original write +# request is failed too and no data is written to file child. # # @target: The target for copy-before-write operations. # @@ -4726,9 +4721,8 @@ =20 ## # @BlockdevOptions: -# -# Options for creating a block device. Many options are available for -# all block devices, independent of the block driver: +# Options for creating a block device. Many options are available +# for all block devices, independent of the block driver: # # @driver: block driver name # @@ -5513,9 +5507,8 @@ =20 ## # @BlockdevAmendOptionsQcow2: -# -# Driver specific image amend options for qcow2. For now, only -# encryption options can be amended +# Driver specific image amend options for qcow2. For now, only +# encryption options can be amended # # @encrypt: Encryption options to be amended # --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674489; cv=none; d=zohomail.com; s=zohoarc; b=Q4fjQRW688OeuXrVuKLPVQxlXVf+iCODOtE4OwkpUvsa7irR0mMrcyZ287kXJf3zrg6gq/cOBlaXCmpRE6TxYhFY/Gy4g6O+ri/VTTeUKfp49Sxcpk0iUbpovfjWBgGeSpfkpAWUmzgf+E6eFsJEpPbKlnN+W8WaT7EnGbvQfh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674489; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aZAVusv6m/bEGGSvcwML1ZDmyHw8pmyH0ioJKtxzotI=; b=BYExwKalCcqw2utQubtX5J96rs0yxFoMJmSHxLRRLhU4eizH0rsrYLw5wJta3cIrqbD7rHscf9juHH8+X8uuJ6JmoqqsgW9EYjdzLuHK+AUwvjwcHkEURzFRdQBGBMDXwMXHg40ydg2fIq8Ug8AHVEJdfeuQdqOPqakrVzaaoUE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17896744899621022.9361729812587; Thu, 17 Sep 2026 12:48:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4F-0005pU-K6; Thu, 17 Sep 2026 15:46:47 -0400 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 1x7I48-0005mW-Uy for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7I47-0005Ek-Ha for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:40 -0400 Received: from mx-prod-mc-08.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-346-XRN2gd4AOfyppiFoVK7CjQ-1; Thu, 17 Sep 2026 15:46:37 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5D27218F0F2B; Thu, 17 Sep 2026 19:46:35 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5584119AC049; Thu, 17 Sep 2026 19:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674398; 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: in-reply-to:in-reply-to:references:references; bh=aZAVusv6m/bEGGSvcwML1ZDmyHw8pmyH0ioJKtxzotI=; b=UtUjd1lGP1mX7zUA9snS0VA7+Gn++t3OP4nJhPWGmbV2IgqDJUFsfjAJhNoKlmzTwQ+oIZ 0QJ+/lPTYdLObYrx6XVP8bKX5G/YUikoH+Y2ilbjd8jz3wsVKKATaChxHiwEpOLa+zRZ0+ JJMTEnH1gnXanKowGTCbwdI4bAAlbrM= X-MC-Unique: XRN2gd4AOfyppiFoVK7CjQ-1 X-Mimecast-MFC-AGG-ID: XRN2gd4AOfyppiFoVK7CjQ_1789674395 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 5/7] qapi/parser: fix intermediate "intro" detection Date: Thu, 17 Sep 2026 15:46:12 -0400 Message-ID: <20260917194614.549584-6-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674491211158501 Content-Type: text/plain; charset="utf-8" In 43e7ad1a3fa5, I adjusted the insertion algorithm for inserting something after the "introduction" to cope with both the old and new syntax while we converted QAPI to the new syntax. There's a bug in that code that only shows up in a handful of cases and only when using the new syntax while this affordance/flex code is still enabled. In the case that we do actually have a real bona-fide intro section, we want to insert directly after that real-deal intro section, not after any plaintext sections that may follow it. This code adjusts the temporary code to strongly prefer inserting after the actual intro section if it exists. Once again: once conversion is done, you will be delighted by how much of this ugly code goes away. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- scripts/qapi/parser.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 9e14c2f7921..dcc04b2663e 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -845,6 +845,14 @@ def _insert_after_intro( needed and ``_insert_near_kind(QAPIDoc.Kind.INTRO, ...)`` will be sufficient. """ + first =3D self.all_sections[0] + if first.text and first.kind =3D=3D QAPIDoc.Kind.INTRO: + # First section is introduction and is non-empty: insert here. + # Rest assured all of this ugliness will very soon go away. + # Pinkie-swear. + self.all_sections.insert(1, section) + return + index =3D 0 for index, ref_section in enumerate(self.all_sections): if ref_section.kind.name in ("PLAIN", "INTRO"): --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674476; cv=none; d=zohomail.com; s=zohoarc; b=b82bMPyVXT9bluTRGABr6Ygahdy/9oq3AIo2U0o2K4GIRCFHxE3CAxwpPT6VkqsdqLXEArOxNBX5FaHYiKwdxRP8OjXWgZk0OjKK0x3xPAa+yO3JM3yZrY2lhq3nh3bUU5TQTUee0O1e+PIqvxyQQmBXZji3DKi+sItZUePr6XQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674476; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YBhz2UZF8bOOsvlTvTMmJ20/Eqyxkh0IEGurbSrhuto=; b=k/2FPpxwKQnJykFWiveo31GbZ41AUEKHpvOEeSi8SZwbbn08ZVWGKaDF/d5VrZCkZ6kkxne6UZGc3iCgZ65uGdzr/xczh3MNymcYLXxy5oitHAWif0m0UI23mYTR/H41b6Nj5JMShJqmBEDn/yjoQLHKF0jb3jGGkxjwhw7gCO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674476697153.06848812555813; Thu, 17 Sep 2026 12:47:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4H-0005qP-UP; Thu, 17 Sep 2026 15:46:51 -0400 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 1x7I4F-0005pN-D5 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:47 -0400 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 1x7I4D-0005Fl-S3 for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:47 -0400 Received: from mx-prod-mc-08.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-441-zhSVGg5TMNydYvXgkMQvSQ-1; Thu, 17 Sep 2026 15:46:40 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 04CAE1912C44; Thu, 17 Sep 2026 19:46:39 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9249019AC047; Thu, 17 Sep 2026 19:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674405; 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: in-reply-to:in-reply-to:references:references; bh=YBhz2UZF8bOOsvlTvTMmJ20/Eqyxkh0IEGurbSrhuto=; b=OBkRcKBqDGpg3ETvK0qwnUvCEPTnXofvbA7TYdPFIGmWr55/PiVtkI0FAuRqEFsSGWhyXM 1DvfyWM/iKSsr/DjOoQcWqOFO02dyRUW33iGcRs3A+NKxH79wMikXlUznvEHh7OrA3WPTv +f+b/Uz73zlDy8b8q45KO/K+cMb0yB0= X-MC-Unique: zhSVGg5TMNydYvXgkMQvSQ-1 X-Mimecast-MFC-AGG-ID: zhSVGg5TMNydYvXgkMQvSQ_1789674399 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 6/7] qapi: convert intro sections with "TODO" markers Date: Thu, 17 Sep 2026 15:46:13 -0400 Message-ID: <20260917194614.549584-7-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674479468158500 Content-Type: text/plain; charset="utf-8" This patch converts intro sections that are immediately followed by a "TODO:" that was formerly used to demarcate the stub member insertion point. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- qapi/machine.json | 7 ++----- qapi/migration.json | 10 ++-------- qapi/net.json | 9 +++------ qapi/yank.json | 5 +---- 4 files changed, 8 insertions(+), 23 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index a58e373dd70..84d95c8d87f 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1244,11 +1244,8 @@ =20 ## # @query-memory-size-summary: -# -# Return the amount of initially allocated and present hotpluggable -# (if enabled) memory in bytes. -# -# TODO: This line is a hack to separate the example from the body +# Return the amount of initially allocated and present +# hotpluggable (if enabled) memory in bytes. # # .. qmp-example:: # diff --git a/qapi/migration.json b/qapi/migration.json index 0428f777882..d571c06fc20 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1617,10 +1617,7 @@ =20 ## # @query-xen-replication-status: -# -# Query replication status while the vm is running. -# -# TODO: This line is a hack to separate the example from the body +# Query replication status while the vm is running. # # .. qmp-example:: # @@ -1670,10 +1667,7 @@ =20 ## # @query-colo-status: -# -# Query COLO status while the vm is running. -# -# TODO: This line is a hack to separate the example from the body +# Query COLO status while the vm is running. # # .. qmp-example:: # diff --git a/qapi/net.json b/qapi/net.json index 526108ca0bb..d0bacb4dcfe 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -1159,12 +1159,9 @@ =20 ## # @announce-self: -# -# Trigger generation of broadcast RARP frames to update network -# switches. This can be useful when network bonds fail-over the -# active slave. -# -# TODO: This line is a hack to separate the example from the body +# Trigger generation of broadcast RARP frames to update network +# switches. This can be useful when network bonds fail-over the +# active slave. # # .. qmp-example:: # diff --git a/qapi/yank.json b/qapi/yank.json index 8ac4b773653..187a0952e66 100644 --- a/qapi/yank.json +++ b/qapi/yank.json @@ -96,10 +96,7 @@ =20 ## # @query-yank: -# -# Query yank instances. See `YankInstance` for more information. -# -# TODO: This line is a hack to separate the example from the body +# Query yank instances. See `YankInstance` for more information. # # .. qmp-example:: # --=20 2.55.0 From nobody Sat Sep 26 22:14:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1789674494; cv=none; d=zohomail.com; s=zohoarc; b=NOvM78DXs0DSDnPHhNy+LF1NO8aOW3QNHnjo9rsS0Ic1cdZLY/CS6EQmyenlKXI2OO7g9tyz8WlSDFSCjpXzPmNgWH/Uns3Qg9JOT32OsyBeiYQJliA6RgkIEVIf4Lu1Q8dJpN1IzbPkMkUMWt15F6SZFFE6IrI86dCH95e/FC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789674494; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CQ5l2zQTKXrlbIqeocoytsYz76jJ9tSoC9AMPa4JXT4=; b=gYWwkKHZnOIEpttJh+kSku3PA7DUtBauLnpSuYYSDvm8rAp2AiLYuoe3Vp7M+06nErkwwtWScF0ErJN6jZ+YpVbAbR7ykqYyvmHGhR5HwCPQ5pZntr/+zNZaZEL3yOlpr11PY+s/dEOeUpjL6njkwgb/wffHpPBmGp3C0MG6PRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1789674494073100.28170116823537; Thu, 17 Sep 2026 12:48:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x7I4O-0005rk-Ox; Thu, 17 Sep 2026 15:46:57 -0400 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 1x7I4H-0005qg-Lj for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1x7I4F-0005G3-Sf for qemu-devel@nongnu.org; Thu, 17 Sep 2026 15:46:49 -0400 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-692-F7cXhwGiN9aA31adMYohaw-1; Thu, 17 Sep 2026 15:46:43 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 ED0DC1800758; Thu, 17 Sep 2026 19:46:41 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.85]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3B2A419AC047; Thu, 17 Sep 2026 19:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789674407; 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: in-reply-to:in-reply-to:references:references; bh=CQ5l2zQTKXrlbIqeocoytsYz76jJ9tSoC9AMPa4JXT4=; b=Bx0L+mw3PcMMQp8Ng3jslfx0JLhrqO7/1/Hr7bcKjy9WWp9LOsDKSQWCughf8pDR7lWquO lytGCo5+FfBnSbq8ysowVwVdlxQXmBfYA+EQW2XQldQtDyK2v0pT+LOPMdTPpXFxxqdhGl eJEJBS1SlyaKj+wAUDd5Iy+1ysF9xUI= X-MC-Unique: F7cXhwGiN9aA31adMYohaw-1 X-Mimecast-MFC-AGG-ID: F7cXhwGiN9aA31adMYohaw_1789674402 From: John Snow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Peter Xu , Junjie Cao , Michael Roth , Paolo Bonzini , Zhao Liu , linux-cxl@vger.kernel.org, Jason Wang , Eric Blake , Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Lukas Straub , Jonathan Cameron , John Snow Subject: [PATCH v5 7/7] qapi: convert intro sections followed by notes/examples Date: Thu, 17 Sep 2026 15:46:14 -0400 Message-ID: <20260917194614.549584-8-jsnow@redhat.com> In-Reply-To: <20260917194614.549584-1-jsnow@redhat.com> References: <20260917194614.549584-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H3=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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1789674495110158500 Content-Type: text/plain; charset="utf-8" This patch converts intro sections that are immediately followed by ".. note::" or ".. qmp-example::", which provides a natural cutoff point. This patch does not change how these functions happen to be rendered, as they do not have any auto-generated documention inserted into them. Signed-off-by: John Snow Reviewed-by: Markus Armbruster --- qapi/migration.json | 15 +++++++-------- qapi/misc.json | 3 +-- qapi/run-state.json | 7 +++---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index d571c06fc20..a272e701385 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1254,10 +1254,10 @@ =20 ## # @migrate_cancel: -# -# Cancel the currently executing migration process. Allows a new -# migration to be started right after. When postcopy-ram is in use, -# cancelling is not allowed after the postcopy phase has started. +# Cancel the currently executing migration process. Allows a new +# migration to be started right after. When postcopy-ram is in +# use, cancelling is not allowed after the postcopy phase has +# started. # # .. note:: This command succeeds even if there is no migration # process running. @@ -1632,8 +1632,8 @@ =20 ## # @xen-colo-do-checkpoint: -# -# Xen uses this command to notify replication to trigger a checkpoint. +# Xen uses this command to notify replication to trigger a +# checkpoint. # # .. qmp-example:: # @@ -1700,8 +1700,7 @@ =20 ## # @migrate-pause: -# -# Pause a migration. Currently it only supports postcopy. +# Pause a migration. Currently it only supports postcopy. # # .. qmp-example:: # diff --git a/qapi/misc.json b/qapi/misc.json index b7d08532768..b62cabc2b79 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -103,8 +103,7 @@ =20 ## # @query-iothreads: -# -# Return a list of information about each iothread. +# Return a list of information about each iothread. # # .. note:: This list excludes the QEMU main loop thread, which is not # declared using the ``-object iothread`` command-line option. It diff --git a/qapi/run-state.json b/qapi/run-state.json index 703ca1bb5b9..8bbd9884087 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -232,10 +232,9 @@ =20 ## # @SUSPEND_DISK: -# -# Emitted when guest enters a hardware suspension state with data -# saved on disk, for example, S4 state, which is sometimes called -# hibernate state +# Emitted when guest enters a hardware suspension state with data +# saved on disk, for example, S4 state, which is sometimes called +# hibernate state # # .. note:: QEMU shuts down (similar to event `SHUTDOWN`) when # entering this state. --=20 2.55.0