From nobody Mon Sep 16 19:10:19 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linutronix.de ARC-Seal: i=1; a=rsa-sha256; t=1721305443; cv=none; d=zohomail.com; s=zohoarc; b=RKw9cBBETyMvJLFu2gr3dBI8p5nhktluvBi2ZPnvf+uWrMk3FT6FriCbvVEmP2M2vjlvIz+PxulBh3m5N3yOY/3YJ6+V1KJvhYU1j2drwjYc06d7BpfVZy2/aaFzbiuL1B3+lRMbMFPBGLvu0vY591gSkQwc6QkRl2DUM3RlmUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721305443; h=Content-Type: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=pKoQny0JNC81tqepEH2Y0PTkyMY6TR51gl8HfjhZtEc=; b=fJY2pq/Vwh0cRIGkQ4xfziORcSop1ivXeUsHQZnuKyhSaxprZVw2K4wwxmh0VccwDowv43gkZgIKZycSnqP0Ye801yW2cH5plJnpQ8kbyBpWVeErOisOEi9SgR782tb8Fdiyk+UE4A4x4Gx1F/cyQI+Uf63vhj+jmGC0iZwVSlU= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721305443506365.31076952465355; Thu, 18 Jul 2024 05:24:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUQAC-0008OO-Ai; Thu, 18 Jul 2024 08:23:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA6-0008BG-7Y for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:07 -0400 Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA1-0003tU-Cy for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:04 -0400 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1721305378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pKoQny0JNC81tqepEH2Y0PTkyMY6TR51gl8HfjhZtEc=; b=vjdMU4deM2ZJ1QarabnSb0baLWgkPzgCFmae83G2Khqe+kvuDaiAzMFR2u9M+tKMRN5XL1 JKjkLQN9n5p868DWYsRBZwBihhY7DotAJecWbtQqwK8r7FW7yJutCCiOTz81JTvKyc8+up 8dEJIYnPTmmLR44tXAi84lemYDQOQ04ojMLJy/b1Pk28ihO2pecNqnlJb8GwKfIYwQo4Bf phBDQZgThuDmck5Jm2kF1JaDKXYDRfQc0OqSDL+q5b/lMh0MMRgr7PdkdzvLrFfZ+k9EM7 UJN7PkgqakiC0J14JxFtoCbiPs9YtYVUPe30GtU6qKEPmvN0TdypJnsOsHymIQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1721305378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pKoQny0JNC81tqepEH2Y0PTkyMY6TR51gl8HfjhZtEc=; b=AbLg6E5LQZoJn6sqLzPx0hZ5dd9G1i1lpc8mJyZEkVOk5sWJ9DaId8tGYCmxLWnVJ4rcrA jG4gDVB+TIzLMEDQ== Date: Thu, 18 Jul 2024 14:21:45 +0200 Subject: [PATCH v5 1/4] docs/interop/firmware.json: add new enum FirmwareFormat MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240718-qapi-firmware-json-v5-1-0dba12d7aaf5@linutronix.de> References: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> In-Reply-To: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Kashyap Chamarthy Cc: qemu-devel@nongnu.org, Kevin Wolf , Hanna Czenczek , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1721305377; l=1463; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=yaoqLoJ9oEeYkWdBz3Fajrr9wjMuB4kwcL7T+Hk31YE=; b=ateWysdE4erDgR85k71zHF4cR0v7c+ZOBtDmkukazYHONtlpwQam7U95x0PniXTqsE9J3f4fu Dao6gsaLsrYD0IxvASJgiTUG2/aEzy+AV82vVLdP6EuEGDm2oUyBj9A X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a0a:51c0:0:12e:550::1; envelope-from=t-8ch@linutronix.de; helo=galois.linutronix.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linutronix.de) X-ZM-MESSAGEID: 1721305445472116300 Only a small subset of all blockdev drivers make sense for firmware images. Introduce and use a new enum to represent this. This also reduces the dependency on firmware.json from the global qapi definitions. Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Wei=C3=9Fschuh --- docs/interop/firmware.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 54a1fc6c1041..a26fe81bf2fe 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -15,7 +15,6 @@ ## =20 { 'include' : 'machine.json' } -{ 'include' : 'block-core.json' } =20 ## # @FirmwareOSInterface: @@ -200,6 +199,20 @@ 'enrolled-keys', 'requires-smm', 'secure-boot', 'verbose-dynamic', 'verbose-static' ] } =20 +## +# @FirmwareFormat: +# +# Formats that are supported for firmware images. +# +# @raw: Raw disk image format. +# +# @qcow2: QEMU image format. +# +# Since: 9.1 +## +{ 'enum': 'FirmwareFormat', + 'data': [ 'raw', 'qcow2' ] } + ## # @FirmwareFlashFile: # @@ -219,7 +232,7 @@ ## { 'struct' : 'FirmwareFlashFile', 'data' : { 'filename' : 'str', - 'format' : 'BlockdevDriver' } } + 'format' : 'FirmwareFormat' } } =20 =20 ## --=20 2.45.2 From nobody Mon Sep 16 19:10:19 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linutronix.de ARC-Seal: i=1; a=rsa-sha256; t=1721305428; cv=none; d=zohomail.com; s=zohoarc; b=YiPHhdVNzMO5psrrBSgmu8jidNlspIbmBd7+h7SuH2duk62R5woW/50C+pOz3Fp8RT6WhmI6tHv/I9Qk0z5NHcl7OVAQ+CbP1aequOMgWETEyL38FlyuHxuWKAxUyPDd/ML72n/vOAaWRP3PaKpEoZxBlDcS3jzPExm1XHljWaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721305428; h=Content-Type: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=XptUzUEXrtr4yZkyH2jQPosspL2+YgSjItivdBPmisA=; b=P+Oi+SDBQByHt2H/uf1yf1bRxM97sWhHiS5Un6aGFGQ3uy/pG2mC7EEB57mRPPL5SftYRljvg/8Xikh4JxNzQMZSwnHzRDoWS9sg4nvor82R1FdhGjUTGARbTmyjrRB4uukexY+ePlUZQK/4CaG8o19H8pJQVYdkZnVdiieJeGI= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721305428890169.63414641305712; Thu, 18 Jul 2024 05:23:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUQA9-0008E0-Rw; Thu, 18 Jul 2024 08:23:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA4-0008AE-G3 for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:04 -0400 Received: from galois.linutronix.de ([193.142.43.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA1-0003tY-EL for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:03 -0400 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1721305378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XptUzUEXrtr4yZkyH2jQPosspL2+YgSjItivdBPmisA=; b=pY58tRpwEGP+Y9jIDb3ZkdxIgMWsBi9tgtIGKTAbiQBDW9vovGofmsr3An385Wxv0vYlE1 ZLveNmP/FHcgIrcUJvQW2Lnv/AH9dyZYOMAqk4NDOvKf1v2XN8VoB+JhhjSDMoKOq6lTFe zqZ955H2u6W8Z4VbS4amuLiPXhVmzN+E0/cTK2h0owWJttwMeqEKsgvOtWLZfmUXoz3dun 743tpxxR0o0AMEpBcIw3lkP0rnzC0v3eFe0nWdM77F2iWLFNNKq2A+Nk+6fDuYSCYflpMt FjoTl90BS0lcMUrep/Q20T1gSXSBKtH7yzruhKO6P6a8iXOCgxbAZtINXxVHNQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1721305378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XptUzUEXrtr4yZkyH2jQPosspL2+YgSjItivdBPmisA=; b=DY3I6TTPl7Yx2swzzVlBSv7cwJyPkZdmbNAg2WdjFf1GTNSiOSwp2pqZQNYlzWNVTa3Im+ ufFuXJVSFgm72FAg== Date: Thu, 18 Jul 2024 14:21:46 +0200 Subject: [PATCH v5 2/4] docs/interop/firmware.json: add new enum FirmwareArchitecture MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240718-qapi-firmware-json-v5-2-0dba12d7aaf5@linutronix.de> References: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> In-Reply-To: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Kashyap Chamarthy Cc: qemu-devel@nongnu.org, Kevin Wolf , Hanna Czenczek , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1721305377; l=1764; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=RHiWTBlp/jQBh6ke+E4n2AT2bdmo2xggsvETIP8ovLI=; b=4kSjjai5I6M1n6f3lSN47nMDkw7ZozrGxRJSOVQpbNrzb+CC6mp8lk08F8nXAZVnwiWU0ltcr uslhza9sU95B0M56xHEiJ+ka92slEJaDo5Y/8VUVxOMo6eaQA47nx8g X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=193.142.43.55; envelope-from=t-8ch@linutronix.de; helo=galois.linutronix.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linutronix.de) X-ZM-MESSAGEID: 1721305429593116300 Only a small subset of all architectures supported by qemu make use of firmware files. Introduce and use a new enum to represent this. This also removes the dependency to machine.json from the global qapi definitions. Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Wei=C3=9Fschuh --- docs/interop/firmware.json | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index a26fe81bf2fe..2eb0be11d595 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -14,7 +14,10 @@ # =3D Firmware ## =20 -{ 'include' : 'machine.json' } +{ 'pragma': { + 'member-name-exceptions': [ + 'FirmwareArchitecture' # x86_64 + ] } } =20 ## # @FirmwareOSInterface: @@ -59,6 +62,28 @@ { 'enum' : 'FirmwareDevice', 'data' : [ 'flash', 'kernel', 'memory' ] } =20 +## +# @FirmwareArchitecture: +# +# Enumerations of architectures for which Qemu uses additional firmware fi= les. +# The values are a subset of the enum SysEmuTarget. +# +# @aarch64: 64-bit Arm. +# +# @arm: 32-bit Arm. +# +# @i386: 32-bit x86. +# +# @loongarch64: 64-bit LoongArch. +# +# @x86_64: 64-bit x86. +# +# Since: 9.1 +## +{ 'enum' : 'FirmwareArchitecture', + 'data' : [ 'aarch64', 'arm', 'i386', 'loongarch64', 'x86_64' ] } + + ## # @FirmwareTarget: # @@ -80,7 +105,7 @@ # Since: 3.0 ## { 'struct' : 'FirmwareTarget', - 'data' : { 'architecture' : 'SysEmuTarget', + 'data' : { 'architecture' : 'FirmwareArchitecture', 'machines' : [ 'str' ] } } =20 ## --=20 2.45.2 From nobody Mon Sep 16 19:10:19 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linutronix.de ARC-Seal: i=1; a=rsa-sha256; t=1721305428; cv=none; d=zohomail.com; s=zohoarc; b=gL3b8dKnE0aIv60sSKhwgln5zlr4PcZRx0mVfUsvQIL2bnW4KDUtwNnNic35L9w1kFqH7SKvVLGEeweX36kMhliO+edzY9K1z6UGdGBAJ/CJkTDlBIp0PfdKuO7hu2br8HmaMFX2R6l/QiWXxa+2pijlqaDzHkROmpNYyht3PTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721305428; h=Content-Type: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=q1DDecY2CNs/KYlhESu+7Ks+xwCfoEqrer8QTqku9Jw=; b=nG3jErQcUvXxQZJD+QtslbgC0kCXLeTkBL2wqZvtSaIZJ5RGt0aR8pZQSxpQ/IpG3vyF56ZFxS0fZrPZ/8MaDcb/prful1TZOmf9xl2q+ZxjIDTGB1Qhy+DGFv5zc/QpSEfU4MbGQ6hgL7m7hf6OYFqtAh/mgCrXLBZbvMGrbkY= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721305428890344.455488263288; Thu, 18 Jul 2024 05:23:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUQA8-0008BI-F7; Thu, 18 Jul 2024 08:23:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA4-0008AD-FJ for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:04 -0400 Received: from galois.linutronix.de ([193.142.43.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA1-0003tZ-Cw for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:03 -0400 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1721305379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q1DDecY2CNs/KYlhESu+7Ks+xwCfoEqrer8QTqku9Jw=; b=BH/MQ/5nM7KQPENOjMskr5NzC9/TyRRCcDjfO5fYKOV9pgwhzTqw+67Rb79uDSClqiWB+1 EX2N/tZJiR0s0DJZlKGuhL/rVsYr3TMvusDfhs5/jtHQmeYoVnCNKwN0T1dKSFtleTPxh/ kvMpA0TX8YppT0eYZCdA2TgDimj1gAr4j8m4LHad96EHamq/NMRtQeZo+44af1hmRUov6E aetXD8xMuPMtKjYCj4CzdzKk2eZW0zml54GRyKDKEwn64jmm86/8ApNPWHit/WjLQu993Q R5tMsbhY4YxbOTt4SSwZCdV5Tm7H+dlYUUdT0Hy4JniOlpfaYF/UVavNClcOPQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1721305379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q1DDecY2CNs/KYlhESu+7Ks+xwCfoEqrer8QTqku9Jw=; b=qlW7+JqbZjDFazV3ZUgxLROBJBEysxdimvW8RpHO75Fks5Q6CTu1+9+07ZxrOHGWLclBiN lsYpzLxmGOEXSlDA== Date: Thu, 18 Jul 2024 14:21:47 +0200 Subject: [PATCH v5 3/4] docs/interop/firmware.json: convert "Example" section MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240718-qapi-firmware-json-v5-3-0dba12d7aaf5@linutronix.de> References: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> In-Reply-To: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Kashyap Chamarthy Cc: qemu-devel@nongnu.org, Kevin Wolf , Hanna Czenczek , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1721305377; l=778; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=x/QTmRlQohiKwdha1V5OaaAH5ZGyY4FvEq648CpilwY=; b=F0wznKeEpp5lsroSbGQZi0xJnMzbxVTcdFBQr2Ftjarkv6vrV9xEDfas1jNxIPt7y/WCtSzSB kiVWhaWnLA5CaFcvqv4Md28khWIoIXSzRSAy0YNhV0kPt2+jVTDci4I X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=193.142.43.55; envelope-from=t-8ch@linutronix.de; helo=galois.linutronix.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linutronix.de) X-ZM-MESSAGEID: 1721305429507116300 Since commit 3c5f6114d9ff ("qapi: remove "Example" doc section") the "Example" section is not valid anymore. It has been replaced by the "qmp-example" role. This was not detected earlier as firmware.json was not validated. As this validation is about to be added, adapt firmware.json. Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster --- docs/interop/firmware.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index 2eb0be11d595..eea82eef3a07 100644 --- a/docs/interop/firmware.json +++ b/docs/interop/firmware.json @@ -471,7 +471,7 @@ # # Since: 3.0 # -# Examples: +# .. qmp-example:: # # { # "description": "SeaBIOS", --=20 2.45.2 From nobody Mon Sep 16 19:10:19 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linutronix.de ARC-Seal: i=1; a=rsa-sha256; t=1721305474; cv=none; d=zohomail.com; s=zohoarc; b=J8vF2pTzwMuUwNNRJSkW9JES9wu4UmamuIuaN6EiP36QT/6bgFyFfh1QOz0g/2sVdQOcKcTgoR8a7JwvbkhVpDue3G8jsk8lp4IiEd2GsW6N0Ips6jkxqEfTm6R8Vw3DSFdcQa6iyZG1vMzFxM5foAmsdktPfqs2meoqVnJSShI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721305474; h=Content-Type: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=xNYyK17bpiByBadadWuWAioNKspo33nsXME0A+tKcno=; b=ccbXYZvu8wpj9Jkf5jl1+LCoMGhf5gEJCaOC/uCayfq1/7IGrw+A4SnGiKUpgUnmgnB7VAxiHXd8B/D3BJiZu56fTRNz+wNn++f26z+HwZk5EOGZDEH1W+QjYkkXJmqU5ysOKJwjN37WKlbPazLaRQIkYXAOSpS63ca97IlPq/s= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721305474249613.9289063843228; Thu, 18 Jul 2024 05:24:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUQAA-0008Ih-P9; Thu, 18 Jul 2024 08:23:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA6-0008BH-7F for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:07 -0400 Received: from galois.linutronix.de ([193.142.43.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sUQA1-0003ta-C5 for qemu-devel@nongnu.org; Thu, 18 Jul 2024 08:23:04 -0400 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1721305379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xNYyK17bpiByBadadWuWAioNKspo33nsXME0A+tKcno=; b=wh288e4Ew8kzb+73LqPgh/txcPTh4KXf8wGjMqlkmy33Hv1zt3RS7wWsDerPy+FbHQh9Rr S5ltm4KtHAJqZu7l0n/TZlN1pKhh9kLu4q0FejVDlI2IP4S9dWcdlvrOLOi3KdsOvH1px2 +uhl/7Vo1hzzPIg/mC3nxZnT2G4+nYcZL7eVM5j5CZhL6Eh8PymzhCHqsiJZplmYJOQiVC A+MdU/wnXnb0aShPXUm1tAtr7IgdRKm1ddlhjei9d4N/G1cPjVK/f7js4MnZOvk1E53HtP UGxJveQiv4ZuW6A5O8ATk7+NBT1gImH5Gm0F5ckVA3ULp0jrE1wlc/O1Wse40Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1721305379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xNYyK17bpiByBadadWuWAioNKspo33nsXME0A+tKcno=; b=3j89/tXDIM7mxyqTy71i4ZG5nBoFovKoO7wQGMkWKHSMhGL5DEleCacW2bZeJ/eHI00XN8 T5ewe1Zy41WXYyCQ== Date: Thu, 18 Jul 2024 14:21:48 +0200 Subject: [PATCH v5 4/4] docs: add test for firmware.json QAPI MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240718-qapi-firmware-json-v5-4-0dba12d7aaf5@linutronix.de> References: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> In-Reply-To: <20240718-qapi-firmware-json-v5-0-0dba12d7aaf5@linutronix.de> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Kashyap Chamarthy Cc: qemu-devel@nongnu.org, Kevin Wolf , Hanna Czenczek , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1721305377; l=948; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=guiw85EHcqaiDUdDat61xnuzERnU9TaIhr+rl/h3ve4=; b=9/rk8lsYLIrsD7k3WeZ6/2+jfkpyO/KRzP7p5WV1svH/LjPPAxGRcKMdpFsIbb1d8+qAlfkLC 6N3zlO+eY6xAjeFKGbcf2ocg4N2ChVIFXAthK374YKCMYQk4Ehix63A X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=193.142.43.55; envelope-from=t-8ch@linutronix.de; helo=galois.linutronix.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linutronix.de) X-ZM-MESSAGEID: 1721305475373116300 To make sure that the QAPI description stays valid add a testcase. Suggested-by: Philippe Mathieu-Daud=C3=A9 Link: https://lore.kernel.org/qemu-devel/d9ce0234-4beb-4b90-b14c-76810d3b81= d7@linaro.org/ Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Wei=C3=9Fschuh --- docs/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/meson.build b/docs/meson.build index 9040f860ae1a..bcca45a342a3 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -99,3 +99,8 @@ if build_docs alias_target('html', sphinxdocs) alias_target('man', sphinxmans) endif + +test('QAPI firmware.json regression tests', python, + args: [qapi_gen.full_path(), '-o', meson.current_build_dir() / 'qapi', + meson.current_source_dir() / 'interop/firmware.json'], + env: test_env, suite: ['qapi-schema', 'qapi-interop']) --=20 2.45.2