From nobody Sat Sep 26 22:14:21 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=1789506952; cv=none; d=zohomail.com; s=zohoarc; b=Mi7TxWKhHEXJDJ4mFfF7Bm2c5KVYenoqZZVHRunJ4qeD1sU1hOs7HCj83dteHhIRQAFCBYI8S3LOWfm8CK33Pc2W7EsfkM88DdFAzUXDAjZlVEThcYtxdZqAIu/ZLYcEd958HNDgcMo5nndCOezRNSXMR4Hd3t04sei1aI1TVJ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789506952; 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=CunYTpzvVJVAjiNgmqkN/a2K3UT1cDWPKymrJd7AyMG8IGobVKH6Q0Gad6YdDdILQxV1ZDHe+7jO8oGojxSmUhXfnD4nnJXVgA0CwdTnk79EhSiMPWQ7YKKspMSFBTnWffbllykvr0yTmDCBI/uAiuLz+hKLm5UEMl/4ap/G4mk= 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 1789506952596616.8007990270187; Tue, 15 Sep 2026 14:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aUc-0000wB-JR; Tue, 15 Sep 2026 17:15:12 -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 1x6aUR-0000tF-GD for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14:57 -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 1x6aUN-0002XT-5h for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14:53 -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-1-pdifhGYRN56x4vcExPivTA-1; Tue, 15 Sep 2026 17:14:46 -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 907B11955D77; Tue, 15 Sep 2026 21:14:44 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 22BB71956042; Tue, 15 Sep 2026 21:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506890; 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=DVb4VBcXN98pne1a5EJUtxYSd1BtP38pb1tzULg0ERvGDdnJsgQfG+EwDzIyGZGhiqR8ZP PIQY4wRHkYjV7G8GrTEv9zWEIu8XKwwiiIAfQb/XJ72uhXajm1aUo88myeB/PVllxlSkaf FHO+69O63mRppzoLI6lO12/H1Cthc0U= X-MC-Unique: pdifhGYRN56x4vcExPivTA-1 X-Mimecast-MFC-AGG-ID: pdifhGYRN56x4vcExPivTA_1789506884 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 1/7] qapi: convert remaining simple intros for block-export.json Date: Tue, 15 Sep 2026 17:14:28 -0400 Message-ID: <20260915211434.3511110-2-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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: 1789506954001158500 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:14:21 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=1789506952; cv=none; d=zohomail.com; s=zohoarc; b=F3wTbQ58Mk9G8a6Tua0rAzZakqjXCO18uGlrbykAyheOf99BLMj+nSaic5AqryGQ95HXc63HfgTd8brnbk5A+jUdqATzTovuGGUVYO/fOxYcAp57ghyOVWIZ/D2zx3BUVaQgs6eGfVN3RgOt0hKJcFQnGCRE5Blp1SWZK+yb1uE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789506952; 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=W11vd9kwgbA+m4E+T+IqShnbb3Plix0UuOG8cf9ZcHD69I1twt3lcjsqjnoDKijx0nbA6z5gaP+GEtRC6U7ke4LyOabCF6XQCqRnRgjzQGDp0hoMym5vcKRC4oAkX0MaoOfYGD/3GCR4GlgZgYZkoDupsMiIMqtqqW0jO3fM5xw= 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 1789506952571329.5948523093308; Tue, 15 Sep 2026 14:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV1-0001Ah-Ic; Tue, 15 Sep 2026 17:15: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 1x6aUT-0000tc-If for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14:57 -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 1x6aUQ-0002Xv-Qa for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14:56 -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-460-JSKvkBwFMaaijDl_wZzByw-1; Tue, 15 Sep 2026 17:14:49 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 85C4F1944B30; Tue, 15 Sep 2026 21:14:47 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C5CCD1956095; Tue, 15 Sep 2026 21:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506893; 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=QqQ4uW4VpPLJQ4+soTE2yn9PMVnDRUg1r3kfUU34ApXGKxQbPxIcJgkUHS98yGRAUijUWl 209wA4zEnIB0gDDkhsuLF7d/hdDKkJbxT+X+eu94piDcGJRBIsNwFnNshl2RFcwNClKbcV LNgYz8H8dXYu+Ps23P3Zzhq5pRXCkSY= X-MC-Unique: JSKvkBwFMaaijDl_wZzByw-1 X-Mimecast-MFC-AGG-ID: JSKvkBwFMaaijDl_wZzByw_1789506888 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 2/7] qapi: convert remaining simple intros for cxl.json Date: Tue, 15 Sep 2026 17:14:29 -0400 Message-ID: <20260915211434.3511110-3-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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: 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: 1789506954001158501 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/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:21 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=1789507013; cv=none; d=zohomail.com; s=zohoarc; b=naC7ljbOoCOIuSi7CMrDQVjJ5s4Te6rwvB1ogS1hMAR2LRkclvMzyOtx7BS9q4G7ry9dpRNE433b7z2AQbRvm+RfyV/41ZlVlUsOBj99Dz29ckNil1E4TMgMyPMhMDCJtgMP087vfO4w18UkLJBfZwabKxnkt3A0VkE+2eHGw20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789507013; 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=NKPSpHSAdUW0sNBcwRZtBbtyHQtLc8C/jg53CK8yBGQ=; b=FWAcCjMymVnMr1kwwzKeFvsOyzrXdGO511RWS8ZFRMAP7QjWIbEMmS3nJxN4N44PeDZEXtnw2/5e3QppKQGIrnJ5VhMDQ3wGmjTQ/3JrnEsiKeHy04dUNusm1vR5lbKiEaS3IiLrz3dyjPeGur+yQxZDLxFQloAMNBTk54XMwzs= 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 178950701330529.202369451411414; Tue, 15 Sep 2026 14:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV3-0001DF-3Y; Tue, 15 Sep 2026 17:15:33 -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 1x6aUV-0000uj-3p for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14: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 1x6aUT-0002Yn-9j for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:14:58 -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-468-CLIwsidmNUGfqwCogJXUTA-1; Tue, 15 Sep 2026 17:14:53 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id ACBDA19540F2; Tue, 15 Sep 2026 21:14:50 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BA94C1956042; Tue, 15 Sep 2026 21:14:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506896; 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=LHClV6M2yq1qwN5QX8wT2uiJENYUc0fWEwdTdtoghkLIgKH58rAJpGjQ4nZBxjlisJskFV JhG2xFaGKrEEfQcDMcpI7EJ1/29j905Mz/VN9XIjGOCljUUJhYOC6vdwyEJ+FU96v51o0t 21l+rNEr5HeJiD/V6Z9b+psxMGeIKdI= X-MC-Unique: CLIwsidmNUGfqwCogJXUTA-1 X-Mimecast-MFC-AGG-ID: CLIwsidmNUGfqwCogJXUTA_1789506891 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 3/7] qapi: convert remaining simple intros for machine.json Date: Tue, 15 Sep 2026 17:14:30 -0400 Message-ID: <20260915211434.3511110-4-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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: 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: 1789507014298158500 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 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:21 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=1789507014; cv=none; d=zohomail.com; s=zohoarc; b=IxOxBsmcJMOfeKbHvbbHF4TyQXyXaChNzCxuzAat+810xTM9nozz1LLJa/kZ80cMfozptdzFR6NLgswHLmivKV7ftebfJvfZzf48fd3NKRjfKfaaRCWH9fN7t+j7kGyO13GbvyNKehRbtH6osCbjjafWJbQsXeqk/WiTj1Z7o1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789507014; 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=Dee5qt9p6Rd14zOmvhCGrItntgPbW7MlN0f9GEe58zpKnXAScXYc87Q5OCzSdFH0ixL+cueFvR/c0HkOONhCThJtXWo8OetKQeG9aTo5BoXxoaVoddYQh97tpCpdOFQj56H+obYFNNvWt/sG9ckgMrzhaWQRvik0fnOEjSFDXW8= 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 1789507014821355.5560527201882; Tue, 15 Sep 2026 14:16:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV4-0001Dj-Ay; Tue, 15 Sep 2026 17:15:34 -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 1x6aUX-0000wA-HG for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:04 -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 1x6aUV-0002ZJ-OE for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:01 -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-55-bMw2B6MmOmSnpJxSHceQbg-1; Tue, 15 Sep 2026 17:14:55 -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 8D9BF1800591; Tue, 15 Sep 2026 21:14:53 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E15CA1956095; Tue, 15 Sep 2026 21:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506898; 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=UCCDPQ8iLtRhKkAGGoP9WPdJm4MFFRcbzkvzPieEbRDEtDUkbJHLFFPQs6rJfy1xIAkoCK cMppj3S8CaygA5sn/x2wI1g0vyKe4TtIv3tD+c5EVxxTvwHNA/LqukUkRBVdkJNwhdCqy7 gKiRQMy7Xp4+i757v7kXE0FZdwX1cTs= X-MC-Unique: bMw2B6MmOmSnpJxSHceQbg-1 X-Mimecast-MFC-AGG-ID: bMw2B6MmOmSnpJxSHceQbg_1789506893 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 4/7] qapi: convert remaining simple intros for block-core.json Date: Tue, 15 Sep 2026 17:14:31 -0400 Message-ID: <20260915211434.3511110-5-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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=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: 1789507016332158500 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:14:21 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=1789506952; cv=none; d=zohomail.com; s=zohoarc; b=WuzeixEwNnv9KE7nCurw0wCmMEfBXXEspNdekK2gWcZYyNXl4a1L7LOi2ElqnYBbA8NixkHoXMWNJNKwxqYcSTKx+Tcrz+pTLu2EPSxWKlsW840YF1aP1YquR8A45rHwteyOnysQu3qHyZxSEPPMSNp2UVHAkAiv4qqBVCDXfkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789506952; 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=7QdFm9LDvqAFy3p/IgsBk+V7Q79uGRWxYsexXB//xro=; b=gnzAMVnxI53R1WfJWOloxew8cCyxXVhNUFHIrYhqjmAFQa/YbykJfB8pP9LSx7iOAZug+x6VKqrUy8EF1fejLytvXMA3aSG4ZjqQnslw38k+fbCqxkKqmY8sKnol7UHbz2JdqJgFgQ2vwY9TLJNm12EP+awpeNykCHr0sutmsm4= 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 1789506952478430.7528273384528; Tue, 15 Sep 2026 14:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV3-0001DQ-SF; Tue, 15 Sep 2026 17:15:33 -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 1x6aUa-0000xH-PT for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:06 -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 1x6aUX-0002Zf-3V for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:02 -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-225-GspPt5eINne1f4y3mnmvGA-1; Tue, 15 Sep 2026 17:14:58 -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 DD9691843AC3; Tue, 15 Sep 2026 21:14:56 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C1C031956095; Tue, 15 Sep 2026 21:14:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506900; 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=7QdFm9LDvqAFy3p/IgsBk+V7Q79uGRWxYsexXB//xro=; b=hFPdjt1PvSL55uF/PYRGswbx6m3tkvqvBjnYX1j3GtuWw/ilw97DbhizEJJZzKT7hUiFqs c/AoGC1gvv+sTIh45d0oiGONLMCUNq4NBghNhjV7rdlCsRMQllhCAZTE/odvBQUtTUgc6r FUVX3noB7Nclh2wpJZnK62XRP6RJrq4= X-MC-Unique: GspPt5eINne1f4y3mnmvGA-1 X-Mimecast-MFC-AGG-ID: GspPt5eINne1f4y3mnmvGA_1789506897 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 5/7] qapi/parser: fix intermediate "intro" detection Date: Tue, 15 Sep 2026 17:14:32 -0400 Message-ID: <20260915211434.3511110-6-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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=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: 1789506953961158500 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py index 9e14c2f7921..79f03062eea 100644 --- a/scripts/qapi/parser.py +++ b/scripts/qapi/parser.py @@ -845,6 +845,13 @@ 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._insert_near_kind(QAPIDoc.Kind.INTRO, section, after=3DTr= ue) + 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:21 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=1789507018; cv=none; d=zohomail.com; s=zohoarc; b=GjhwiFB+5OhwacQZZcQks1t8GSr9blOR5aidR7gwykMTvdMNQlSckjWdwkbdS1X9UxIcJtjLL2lVZ39E5mhIh45jCr45fOrviZ31WYnQ852cqW1B4U1fFLxYtc+lbZZ01/gkukx4j8iW2AtWsQbvFfBn35wX4875q9dkdN3l278= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789507018; 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=YBhz2UZF8bOOsvlTvTMmJ20/Eqyxkh0IEGurbSrhuto=; b=TCs8v+7R3ZG4xcIivVqsUEwFRvHion2NwrnNl9FDySulrYtcnFpEnErWoeWeWo6Z25PAEdp/tXqQWiKCh6G05CaGN3wMpSpn05IlU3hLtX9RRA+2f2Gp2tbruTFihyDDcgT5uLlIE8l7kiDPYxZky2SdAAPPDJTn3O3qifdRc0Q= 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 178950701872689.14746156314516; Tue, 15 Sep 2026 14:16:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV4-0001Dv-Go; Tue, 15 Sep 2026 17:15:34 -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 1x6aUg-0000yu-FY for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:22 -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 1x6aUb-0002ap-OL for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:07 -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-74-8TXqaac9OUGBwGpMIUjstw-1; Tue, 15 Sep 2026 17:15:01 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B54CF19540C3; Tue, 15 Sep 2026 21:14:59 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1EC551956042; Tue, 15 Sep 2026 21:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506905; 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=BHDulZTnSyp806wDxNxscuzakTKVDxh4mL24BlmxVffHM9oBdtq2ln4Tdmsf5nYKPJQO3p aJ0xCgwKc8/iv6ZgqiT9WI64hAlul4v35Tm+59C/xf7n+KDb+s79K937+Gk3/YQDStquf5 2BuEZyxDuc9zZ3NHHw/T05AdDFM1EkA= X-MC-Unique: 8TXqaac9OUGBwGpMIUjstw-1 X-Mimecast-MFC-AGG-ID: 8TXqaac9OUGBwGpMIUjstw_1789506899 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 6/7] qapi: convert intro sections with "TODO" markers Date: Tue, 15 Sep 2026 17:14:33 -0400 Message-ID: <20260915211434.3511110-7-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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: 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: 1789507020355158500 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 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:21 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=1789507013; cv=none; d=zohomail.com; s=zohoarc; b=ktzqEIOkyF00BQ8gpXdvVdOzIT8oNwKE6aqLw6ApgDrdTXFYhX9OrFnzbVF9JSTcCX8MO8gEOtYyrv+H2yTh0e/6qEcVT6xR6a+0FkK7XMALWvKn6wKNxAIW0fDnEpUAZZlq84lJs+BfJo/SMDTtxZlgdtbH0SehAqkoM6Fox7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1789507013; 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=pxwSvjyweKaZCuJXGsfI9jwtz+eDtnLs/f3FZEar0W4=; b=TKYFz48TGdZ+4lrN1smc5hxgoLA4Fehiggg187M8ffIaUhDATICGn4/qXucucC8F7F273Wv/jpVeCgS73Cl5Al8FJpgDWB2K50VkFIAtwdeiHFjZLd/TkvRfxsQeDGplKzB0G3nlIMTDI7hkXCF8t23zQpbLSoAuL48XXQhYzvI= 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 1789507013428252.49173766691263; Tue, 15 Sep 2026 14:16:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1x6aV6-0001F0-4H; Tue, 15 Sep 2026 17:15:36 -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 1x6aUg-0000yv-Dr for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:22 -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 1x6aUc-0002az-Qy for qemu-devel@nongnu.org; Tue, 15 Sep 2026 17:15:09 -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-110-R9xoFrn1OU-Yu0kfS8WLBA-1; Tue, 15 Sep 2026 17:15:04 -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 86278184B383; Tue, 15 Sep 2026 21:15:02 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.46]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE54A1956095; Tue, 15 Sep 2026 21:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1789506905; 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=pxwSvjyweKaZCuJXGsfI9jwtz+eDtnLs/f3FZEar0W4=; b=BUY6WiWI49/o5UlmyeSfEOF1I4gayD5mZNVGzILwXO09gRXfAB1VsrgL9PtO2oZkDqug7u U3WtXS/hNDUQb9giPfeiF9YQpPgEQ3DzwnyXafOO49eMbaHl9xFziI+yZ2gPeNTwq90oQB 45QRwIqfokUyOx3vqyspsqjp2klkmu4= X-MC-Unique: R9xoFrn1OU-Yu0kfS8WLBA-1 X-Mimecast-MFC-AGG-ID: R9xoFrn1OU-Yu0kfS8WLBA_1789506902 From: John Snow To: qemu-devel@nongnu.org Cc: Fabiano Rosas , Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org, Zhao Liu , linux-cxl@vger.kernel.org, Lukas Straub , Jonathan Cameron , Paolo Bonzini , Peter Xu , Michael Roth , Jason Wang , Eric Blake , Kevin Wolf , Junjie Cao , John Snow Subject: [PATCH v3 7/7] qapi: convert intro sections followed by notes/examples Date: Tue, 15 Sep 2026 17:14:34 -0400 Message-ID: <20260915211434.3511110-8-jsnow@redhat.com> In-Reply-To: <20260915211434.3511110-1-jsnow@redhat.com> References: <20260915211434.3511110-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: 1789507014330158500 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 84d95c8d87f..276258d9e5c 100644 --- a/qapi/machine.json +++ b/qapi/machine.json @@ -1209,9 +1209,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 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