From nobody Sat Sep 26 22:16:24 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=1789485190; cv=none; d=zohomail.com; s=zohoarc; b=ipld5xNqrBnNYieNWlVkyFQGq4cKbxdsiOln76Fkus+J3yAuCXU+KtZ1pSEhlUlaOHxjm9YDG1f3Ef/UwmLc/o5OrQCttCIGzxmhGGHq1rK9r3IA/ZekmSuSs3rkKe+CIe4dELg9lG357RDMaGywoj4iLFhFB2ZHqxtz/IOFjwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485190; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6rV63i5zLz4J/LUzf54w3p9IiUX+skDQOv9c6EGZuIE=; b=JC/edesFA6UI0yY3AdPVIvGU8iwSAmCAhruRi3KPSGez54OScNFnTvxKv74SwXGtH70F1er2LmKJC/qrGV8MNk3IBoVRMzdpYi71Z2BwmhCQl7iZYAe5PDP7/tlHNTC2nGBAZME/v3mUyQUMSMFE7NUpIPy4uBVICZ7/MfbtGjs= 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 178948519043790.79177212702666; Tue, 15 Sep 2026 08:13:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6UpH-0000xl-Su; Tue, 15 Sep 2026 11:12:07 -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 1x6UpD-0000wJ-GJ for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:11:59 -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 1x6Up6-0008SX-De for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:11:55 -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-282-o9sgasYJN_CKZfXvsCe8sQ-1; Tue, 15 Sep 2026 11:11:45 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 C735E1800675; Tue, 15 Sep 2026 15:11:42 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 32313195604E; Tue, 15 Sep 2026 15:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485108; 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=RHqOZBebYWI0qbW3W802tic05uJR7IlQvEc866jyMinOHusM0F6e7OndBOg7b/VRXDiHY7 yhdl2bgE6p4CZqIH4eJKg2ur1tk92GwTghRvCc3yY6uojGdbXNLm7wMyBr4Tsn1CKAzi6/ d+Khle+JrlgXBaIYVHj8HpRFbVgUU/U= X-MC-Unique: o9sgasYJN_CKZfXvsCe8sQ-1 X-Mimecast-MFC-AGG-ID: o9sgasYJN_CKZfXvsCe8sQ_1789485103 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 1/7] qapi: convert remaining simple intros for block-export.json Date: Tue, 15 Sep 2026 11:11:21 -0400 Message-ID: <20260915151127.1002244-2-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 1789485193339158500 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 --- 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:16:24 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=1789485190; cv=none; d=zohomail.com; s=zohoarc; b=GRqRF2Cx4IoJcJqRqQwQz6elPepC+8K6JgPa7QABPIooBpCYm8q8B9imf1IfsNO+0fsk9Pa/vhwWF9xsX5GUaIVvyBmWwW2LSVSLP8w/eRlPGVL90vFWORFgsyAOL9/h1x5QLvllUlRz3B/khKvVgMeUgrYqDCRSdNWnk8poMLQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485190; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ClPV5sIPWojjTAynGwc1mftqvUQ/Gr/l3qbEvnYoawE=; b=harL7fM5pPb8fS/U61wPQO3IIl1xw0IbOGE9JlmFHbyTKIsekuZX0THtCeNnPHuBzfOxj66MWieiYNzm9ZJOmFMS9UpCuNNH1X6jNVdCqO2RqF3DeIG6Qs0BFfykK15ZaVbKeUgE8xxSi4eLg/mnolPHC6ozIHIxSs9it3n2gto= 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 1789485190449122.95146919908075; Tue, 15 Sep 2026 08:13:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6UpY-000126-7S; Tue, 15 Sep 2026 11:12:20 -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 1x6UpG-0000xk-Cz for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:03 -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 1x6UpD-0008VJ-93 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:01 -0400 Received: from mx-prod-mc-03.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-623-tatYzLXsObaa8UZtu6BUVA-1; Tue, 15 Sep 2026 11:11:51 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EAEE819773EF; Tue, 15 Sep 2026 15:11:47 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 083B2195604C; Tue, 15 Sep 2026 15:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485115; 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=gzMgXiiVzs/hsXquzkCaV9pYQlY9EnumKOdZUH/Res5Tdw2uArCYIum+CQiBi6rdFHfleq HPAQX/sVvhLex29aMeQpnt11mzvXo4DPUN1fgQcdKrxdmZmi0l7zcXv0UHZW9jq4yvedC9 GH6g9+2kDekvI/HzEtJingbSgvipGCg= X-MC-Unique: tatYzLXsObaa8UZtu6BUVA-1 X-Mimecast-MFC-AGG-ID: tatYzLXsObaa8UZtu6BUVA_1789485108 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 2/7] qapi: convert remaining simple intros for cxl.json Date: Tue, 15 Sep 2026 11:11:22 -0400 Message-ID: <20260915151127.1002244-3-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 1789485193855158500 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 --- 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:16:24 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=1789485202; cv=none; d=zohomail.com; s=zohoarc; b=T27FWrKM0DysVIYDjXLQBhE0idYhQiea+vc4/n0BFgj20ZDOxXLkZ5iKf6qbz/cbIFQul17G1fjo2UDkL5mJceT95JttuWYNck48hQ3amL27ljgf3JqJWtnDjNdFLb3qqiMhT0vjmmoDDCJ7D5wpQpHxmhiwqEImOWNHuBeVRdQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485202; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kqnCn6G38OWUssJgOIyQiwhSLKRNKgZZBvo5dTe58DE=; b=fi/iQt4h3mVgh4+UMEE/2QL/6xGpUEs1S1FlEdv5P8Vli215slLVHn4lxaZZ75VETdui9O1EqVR39pq6qb5IAwCLBMQfCCf4dpi5LeCTm7leuwoj+Szb3b+EwOcEhHCoeKhhMSWU4OGpv8n7EcKAOJB+ysdmc3M70WeCzYlWYPU= 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 178948520246089.70539520122622; Tue, 15 Sep 2026 08:13:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Uph-00015c-MW; Tue, 15 Sep 2026 11:12:31 -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 1x6UpI-0000yn-Ar for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:07 -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 1x6UpF-0008WH-5f for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:03 -0400 Received: from mx-prod-mc-03.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-534-41nLmPF9My6Bm6Da_F6EBQ-1; Tue, 15 Sep 2026 11:11:56 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 171E7195604A; Tue, 15 Sep 2026 15:11:54 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B02D2195604C; Tue, 15 Sep 2026 15:11:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485120; 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=kqnCn6G38OWUssJgOIyQiwhSLKRNKgZZBvo5dTe58DE=; b=ctD9SgguiIOL3f8TNnxetvXWKjwsPB0iSfpbLcUlhMEyYr7neEVLuUN8ruQqz1jvuICbv3 8vHXQRlAGeI15ww9iH/X9i0bkWXlDKv/QkLEfo2LghYPA6wQPP8lI5M5AWe0ofINqUZ/zO T531wUBLHYOBdm5+wQXGYMD2bWeh5Sg= X-MC-Unique: 41nLmPF9My6Bm6Da_F6EBQ-1 X-Mimecast-MFC-AGG-ID: 41nLmPF9My6Bm6Da_F6EBQ_1789485114 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 3/7] qapi: convert remaining simple intros for machine.json Date: Tue, 15 Sep 2026 11:11:23 -0400 Message-ID: <20260915151127.1002244-4-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1789485205311158500 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 --- qapi/machine.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index 0516112f8e8..13875fc4642 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:16:24 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=1789485224; cv=none; d=zohomail.com; s=zohoarc; b=PyxiWZosltCXLN5abFC7RswKAFr3Sp5fcm+M5lnq9jwoGI4emANBzdLhFsRYmjFWr7wqq5a7yKFxdW1J3QUpJ3gzz5RKiTRi3cZ2GkjvYcJnj3g7XV1dK2Sidio0vJ72NIJ+l6471DGSLmae9ZrVtI2/58g0JICm/a8eHwfctmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485224; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rBLyZXbXlsOC8SLLzAeTtyZ5ri1ynYIY6/I844l2vDU=; b=UDhn4sH8R22Va3VgiZOg+DBjmwMugb70NauJgBNOm2sIIciDD+9hFoe5jinntY/PXoIcycmtJyNlr6/PryEj/z67FjQJG8kva3QtAmyWK3hO70T+Uro19wEJs+CTMVcy+Lh6hL/f1kjAeOtU19lvl8yjFo+xDQ97ayEa2T+fy98= 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 1789485224392696.5797366345986; Tue, 15 Sep 2026 08:13:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Upa-00012u-6x; Tue, 15 Sep 2026 11:12:23 -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 1x6UpL-0000z5-Db for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:07 -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 1x6UpJ-00006N-Jg for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:06 -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-696-yXVnqkb5O0KqbaW2p6bTyg-1; Tue, 15 Sep 2026 11:12:01 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 03E201800668; Tue, 15 Sep 2026 15:11:59 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5E285195604C; Tue, 15 Sep 2026 15:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485125; 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=rBLyZXbXlsOC8SLLzAeTtyZ5ri1ynYIY6/I844l2vDU=; b=gEuugPbZa9KSokZ6QincbyEPllaYMOLNuFQUTALvPZLewEy8delhTo1aT6e+xINPuE76Dc 9cKSbh3Pyi4uFxAZUbQ9e8X29gZRtqy0X84sWBVnNUXeKRgmP6EZp4MttSqga7D6S+pjKK gtZD02UkkUPBHZpF2a5pksoauNjOHIQ= X-MC-Unique: yXVnqkb5O0KqbaW2p6bTyg-1 X-Mimecast-MFC-AGG-ID: yXVnqkb5O0KqbaW2p6bTyg_1789485119 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 4/7] qapi: convert remaining simple intros for block-core.json Date: Tue, 15 Sep 2026 11:11:24 -0400 Message-ID: <20260915151127.1002244-5-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 1789485225247158501 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 --- 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 1ca147285e7..88218e38d02 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4462,9 +4462,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 @@ -4488,9 +4487,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) @@ -4503,9 +4501,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 ## @@ -4515,9 +4512,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) @@ -4643,14 +4639,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. # @@ -4686,9 +4681,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 # @@ -5473,9 +5467,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:16:24 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=1789485190; cv=none; d=zohomail.com; s=zohoarc; b=auphUeA1a//xw7LWFMUF2AIGLYliG4PfNNjwwvlSDae2tm4uMOlSBSRzALujnP9m8KpNxJ7IR+avvleo/BOhkHaIUNDAWmA91U+P82ihnO5M0LJAt80KSi9evbPDZk5LhXGNXL7t4UB6AfAfIhlr4M2xFdpQwPvtYTZzD+RuiOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485190; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+/TEs6WfoqvbeLKb/7GlRm0zX4tMP9iSW1sKdXtrjYQ=; b=hVR9E5HDuMuKuVByxhox9BzPf/7RXjXsEXGYoauMoMdaMkTXTXxDrc6IGY6h2zvaP0peQeqXAJ0L7FG8FKsr5NID5R0Cd/YF/AbxPmXGm3ZelEr++g9/qCJ6/lmYL7XKW7Sj9n5EJ/8xFOr+U0ZmlprmmTyBDDsUhEV/jZz0F2M= 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 1789485190447821.8837245450497; Tue, 15 Sep 2026 08:13:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Upf-00014V-PT; Tue, 15 Sep 2026 11:12:29 -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 1x6UpO-0000zu-VZ for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:12 -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 1x6UpN-00006y-AF for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:10 -0400 Received: from mx-prod-mc-01.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-332-8zwyUbarOoeWSs4bnphLzQ-1; Tue, 15 Sep 2026 11:12:05 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 608141956077; Tue, 15 Sep 2026 15:12:03 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 93C33195604E; Tue, 15 Sep 2026 15:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485128; 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=+/TEs6WfoqvbeLKb/7GlRm0zX4tMP9iSW1sKdXtrjYQ=; b=KF4bZHAHkLFrvJufZHw+MYfEql+r/UhGgtRpZJgGUGfidPROwd5Vq5SqniM7Q+z6vdfP2X etQzGQIYzcmNx4YRs1l1eiHoAshWQq308zAXucIvakLzvkABcVZDLADMlwxDniRK5sDaFr 6zZVmqT0GaLwVipo4xAe7BbZsY6pk3Y= X-MC-Unique: 8zwyUbarOoeWSs4bnphLzQ-1 X-Mimecast-MFC-AGG-ID: 8zwyUbarOoeWSs4bnphLzQ_1789485123 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 5/7] qapi/parser: fix intermediate "intro" detection Date: Tue, 15 Sep 2026 11:11:25 -0400 Message-ID: <20260915151127.1002244-6-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1789485193864158500 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 --- scripts/qapi/parser.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 9e14c2f7921..6ded504835d 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -845,6 +845,16 @@ 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. + return self._insert_near_kind( + QAPIDoc.Kind.INTRO, section, after=3DTrue + ) + + 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:16:24 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=1789485208; cv=none; d=zohomail.com; s=zohoarc; b=VIbPre50iYsp9u2STQiyBp5lYA0FzHbvid+C04dkbYCe209UcIYPJJo12W87a0mYcUPxdA5Y12gHGZJGnvOwVhBDUvq7No3/Xn34WQifV8Y5BdMxXG/1LDm84eN6t/HnMgEbbYyEMB6S94BtMI0W0KbD8cw90tCksJWEEYj1T20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485208; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fVqJB7RA7wK1A3wU0gjI5S+gtvyNP6b0TlS+G7syIFw=; b=Famh26EX71eJxtCioA6adVRAkzV2F8zMAYvjnQHySvghYwUA3q6zOTZ1qaF/jxfaqBdlOzmmY7MV508qV2SPxdcv4RX4VITAXSJPdxIyTTO18lTFypI64EdRgb6IkcoptQuWsu6gVh5DYQy9orC7pktd4/Z6XJ97h5E3E0Vmblk= 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 1789485208958645.6961011717199; Tue, 15 Sep 2026 08:13:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Uq9-0001EY-6z; Tue, 15 Sep 2026 11:12: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 1x6UpT-00011G-7R for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:16 -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 1x6UpR-00007v-N1 for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:14 -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-649-b5gphxSzNg2L9JiAL5ofrw-1; Tue, 15 Sep 2026 11:12:08 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 E2BF11843AE4; Tue, 15 Sep 2026 15:12:05 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 99941195604C; Tue, 15 Sep 2026 15:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485133; 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=fVqJB7RA7wK1A3wU0gjI5S+gtvyNP6b0TlS+G7syIFw=; b=OuEVoPGK1xz2jfGisB28UoSIh6SpDLYLDJw4WCcv+U+UxhllibbSY4V1bVlCZZFOVC06xk KyhQWTG4vgNxFaTefxSzlO/aQS/+ODROsh735mOsinmI3c8Qt3+5bJ64tacTv3Tdim7V1X c+rJP9L4ZfcijvhtzLbkNrBG4FdescQ= X-MC-Unique: b5gphxSzNg2L9JiAL5ofrw-1 X-Mimecast-MFC-AGG-ID: b5gphxSzNg2L9JiAL5ofrw_1789485126 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 6/7] qapi: convert intro sections with "TODO" markers Date: Tue, 15 Sep 2026 11:11:26 -0400 Message-ID: <20260915151127.1002244-7-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 1789485211385158500 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 --- 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 13875fc4642..108033b6d64 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1216,11 +1216,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 8096ef64682..70a1854fb73 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1604,10 +1604,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:: # @@ -1657,10 +1654,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 7aabd8b9260..7a809d9a8a6 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -1113,12 +1113,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:16:24 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=1789485191; cv=none; d=zohomail.com; s=zohoarc; b=F4ihBKgBDw/E3cEXru0F5+l1NJVWdXFCXUPefZp/Bxw/VdNqVTB3E3gwG/eN98H160Cc6KMB8Ne6j1TrYJ8ioBUPJoe0qG684cGVREt6heJ3iredVyxjV8nvV7OAPSi1fw6IW/0p6ULvi67iSPHSZuG1INHVS7I46SKHScxrz4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789485191; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OhXIqCf/hAEpGNtdeyWPDfvZ8dculLK71e35WLjicQI=; b=h4doP1TEaQDkQnriiy+lnKrNyEbr+7ogzvb2+PL/pX6Cu6ljbK2Rzwy8vO753ynK5tQVEiZ6dVSf9mnDeu+a3B0WtqW8HTv+0UTxJ+LBhRvfTOGe5KJgVHxea7PhnvQvfhooMKwUo7N4gmXmNFlMdd7ihi3iM6/aBVwnzwAOl4E= 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 1789485191206738.3274641552047; Tue, 15 Sep 2026 08:13:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6Upw-00016b-Ls; Tue, 15 Sep 2026 11:12: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 1x6UpX-00012K-Fq for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:20 -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 1x6UpV-00008S-VR for qemu-devel@nongnu.org; Tue, 15 Sep 2026 11:12:19 -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-437-Oz1ezOxcMLqFNN-FKlVgMQ-1; Tue, 15 Sep 2026 11:12:12 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 2AF261955EA0; Tue, 15 Sep 2026 15:12:10 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2294C195604C; Tue, 15 Sep 2026 15:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789485136; 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=OhXIqCf/hAEpGNtdeyWPDfvZ8dculLK71e35WLjicQI=; b=IP1l7GBY7bKp/ubfsTRuZHCNaKrOOosLOqksCqOespVlIHI9j6L5D/mfRgAVhtF9ZjfI9L TsGijaIaQCINuIrHQEgUNPjFzzWlK6OuyTxDKyR8cyKFXrz0F1u8+5+opwMEbh+lItu0MB AzKb1k8tgch76zPr2+wUXMjps7pFnbI= X-MC-Unique: Oz1ezOxcMLqFNN-FKlVgMQ-1 X-Mimecast-MFC-AGG-ID: Oz1ezOxcMLqFNN-FKlVgMQ_1789485130 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jonathan Cameron , Kevin Wolf , Peter Xu , Michael Roth , Paolo Bonzini , Jason Wang , Lukas Straub , Eric Blake , Hanna Reitz , Markus Armbruster , linux-cxl@vger.kernel.org, Zhao Liu , qemu-block@nongnu.org, John Snow Subject: [PATCH v2 7/7] qapi: convert intro sections followed by notes/examples Date: Tue, 15 Sep 2026 11:11:27 -0400 Message-ID: <20260915151127.1002244-8-jsnow@redhat.com> In-Reply-To: <20260915151127.1002244-1-jsnow@redhat.com> References: <20260915151127.1002244-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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: 1789485193530158500 Content-Type: text/plain; charset="utf-8" These provide a rather natural cutoff point, but technically this does introduce a new intro/details split to these documentation blocks. Signed-off-by: John Snow --- qapi/machine.json | 5 ++--- qapi/migration.json | 15 +++++++-------- qapi/misc.json | 3 +-- qapi/run-state.json | 7 +++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/qapi/machine.json b/qapi/machine.json index 108033b6d64..9a790da9db2 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1181,9 +1181,8 @@ =20 ## # @HV_BALLOON_STATUS_REPORT: -# -# Emitted when the hv-balloon driver receives a "STATUS" message from -# the guest. +# Emitted when the hv-balloon driver receives a "STATUS" message +# from the guest. # # .. note:: This event is rate-limited. # diff --git a/qapi/migration.json b/qapi/migration.json index 70a1854fb73..c831e692feb 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1241,10 +1241,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. @@ -1619,8 +1619,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:: # @@ -1687,8 +1687,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 b3c2a1421f3..ec783c067c9 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