From nobody Thu Sep 19 01:10:14 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=1721374702; cv=none; d=zohomail.com; s=zohoarc; b=BucksBFkqPXM8FOqBPInVjEje2su0DMEKM4hcGL0WkzKalIp847tZ0UN9gDF1TRACcRuPvZUeXNbfl6blsDQbEfpTUQU1DCbA+uDe3Y8JK1dfy9P4LbKe5/Yj6s5nbZozQELdUpNJ7b4XJ5XNwzatieGHsoVWmy3w+yzKg+DZRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721374702; 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=KBcL1syjyGS1qWE3K7R757xdr/StDjGvbblnaUIALUM=; b=FW2VkC5U8eGBcxgYBOFOfaNGv0lYdqHbgs96xX2f4GgJuB9smCo2kh6UGHUsl7/bojWgDDMaV/xEvRal4NGaS9gt0pE/urfuviO9OdZ+7xUhmEg+FF80diqoWbXIiyoYGdrt64Oj8DHsR/ew6MJy5FENge1qCY2ZOq+50Xvysx8= 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 1721374702826892.7643994144263; Fri, 19 Jul 2024 00:38:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sUiBK-0008V2-9h; Fri, 19 Jul 2024 03:37:34 -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 1sUiBJ-0008Qv-2b for qemu-devel@nongnu.org; Fri, 19 Jul 2024 03:37:33 -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 1sUiBG-0002iv-DO for qemu-devel@nongnu.org; Fri, 19 Jul 2024 03:37:32 -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=1721374648; 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=KBcL1syjyGS1qWE3K7R757xdr/StDjGvbblnaUIALUM=; b=gnIOqJMi4jhe5rY3W+QA82MhYAK5aum08FZmJcqV5YZg5yoFx4jfbUWP0KZNST7Wik6y+4 4kFASciUU+Ii5+HRPaZDh0Gvt3mNvNjGUxLbApXS23EElbBubUoLGomcjDspghSUFZodUB qVBdSRHM0t0Uo0oygPIVAQOniTNOiJ12AtqS7OKht3QALsoTZANfbOQAxMRP6gwPIxXblQ wTS6IdoXVCudJfftqP8NYV7baJz59kQ9RxgcOvffmwaW12PI6WWM+BcHQLk/s1t5nsRpES u1JxEkz2QXKfZOCfKebJ2KN2SQBFtrcf01HBlH7yHw8GG4G3MV+XDcMyPiMNLg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1721374648; 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=KBcL1syjyGS1qWE3K7R757xdr/StDjGvbblnaUIALUM=; b=q7KyU2CZpkDdcqPi/StHf2B//8VmzXvfn9crJhnQamPZWMytjkaz5WIqslYFmr10Kq0iNT nWseVK/xrbvzOCCA== Date: Fri, 19 Jul 2024 09:37:23 +0200 Subject: [PATCH v6 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: <20240719-qapi-firmware-json-v6-2-c2e3de390b58@linutronix.de> References: <20240719-qapi-firmware-json-v6-0-c2e3de390b58@linutronix.de> In-Reply-To: <20240719-qapi-firmware-json-v6-0-c2e3de390b58@linutronix.de> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Kashyap Chamarthy , Markus Armbruster 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=1721374646; l=1862; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=gkYZ4XZ52nfLzPLf7IOMojsPGrZbXCzUZAx5qYcyj3E=; b=4XyFU9GdkmpB0aHaC3Bu/NmghcITGPeX2mpqgYvtC0+OEyDtkvkjEtIXo2Yg/ZP049bWRy9g/ 11EuEsQlcbTDj+Zt3Q2TWwq0IuHL16UZwTybyExWKXNa8vs4JRm6MVj 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: 1721374704115116300 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. Claim "Since: 3.0" for the new enum, because that's correct for most of its members, and the members are what matters in the interface. Suggested-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Markus Armbruster --- docs/interop/firmware.json | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json index d5d4c17f230b..ae4179994479 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,27 @@ { 'enum' : 'FirmwareDevice', 'data' : [ 'flash', 'kernel', 'memory' ] } =20 +## +# @FirmwareArchitecture: +# +# Enumeration of architectures for which Qemu uses additional +# firmware files. +# +# @aarch64: 64-bit Arm. +# +# @arm: 32-bit Arm. +# +# @i386: 32-bit x86. +# +# @loongarch64: 64-bit LoongArch. (since: 7.1) +# +# @x86_64: 64-bit x86. +# +# Since: 3.0 +## +{ 'enum' : 'FirmwareArchitecture', + 'data' : [ 'aarch64', 'arm', 'i386', 'loongarch64', 'x86_64' ] } + ## # @FirmwareTarget: # @@ -80,7 +104,7 @@ # Since: 3.0 ## { 'struct' : 'FirmwareTarget', - 'data' : { 'architecture' : 'SysEmuTarget', + 'data' : { 'architecture' : 'FirmwareArchitecture', 'machines' : [ 'str' ] } } =20 ## --=20 2.45.2