From patchwork Wed May 14 23:41:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 889893 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp2875846wrr; Wed, 14 May 2025 16:42:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVeNWc45pPaC0AaKjX5B1EuNPkl7E2vpOPiGVhH6Z9/t4sYcGdxv5g1XmmR9q3/fUwBhi4h0A==@linaro.org X-Google-Smtp-Source: AGHT+IHdy0bGULp8nHxvOodwMvBnW0iUFDMQwpDzlvRdOhQrPtFBGog9Wbfv7fdKwf/Ns3cmkweu X-Received: by 2002:a05:6214:4111:b0:6f5:748e:c6f4 with SMTP id 6a1803df08f44-6f896ec0fd5mr90466176d6.37.1747266174487; Wed, 14 May 2025 16:42:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747266174; cv=none; d=google.com; s=arc-20240605; b=LVtswLv2xItHt+/AcW31fPoiAlOj1QJgL84f0gnuKFBtSAU6TyRqAoqx/J6CMjgs0h yegTIuG/fELBU1dYJEnaxuYuvgUGDMpHT9TA0LdwAeHKPPaE1RCgxZvH3SwjxyXOoUh7 oGLcUlFu3sGMVWwKchejPBkUMoxSaaegBUU8tBN7svcIhdRhzKXgxn4btjQAZQbRXb8T VODESY4Zi+q1bB3yZgkiWse3TIXldQAACdkNTuG5nktUMv3PexplHP2tE8gYMDOtgnO9 znbozirry0CkyYq/7Cgnwzz88A51C+BclYaSourVkKNNo4nGNg8p+FMYO4po57iyBOLT 6w0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Q3uOJ9bGmUfZ/+MJDYCtssXzNui1of7VtUuGRTJFrsY=; fh=VLmoI/6EX8QpenFjusv8qhWaEfIPciazAbyYTbMJFJo=; b=N15i6cpnCHl0NxxZQ3SSE/zARPElk5TaMV4KnHvFhTuRPFUfF7pUIqSI5dVL8WVrq1 hf/svqPTA77pEvV8unCp/vTg4gl5y3fLnspx3/gwGKtXnaJjyjsZTYJiARiqY/ld5cxi KTQGrLF4O7kXZF06hWN5NRR1nJZ5cGGtmr+f72ZRyHC8S5Ugv7Par1cytgs017bHqWhY t3hM+RV4UqSuRrdn8b0GbHE3ehiZMPHUj9SeL2Ic/Un2RqLsqnM3av0bpbD+cTQ66DVo 3OOxCnGXcU7Fa+UPHalaHiDfDUPyXISGUPdtav50gPdHozcB6f3uL7skdnbsc1GdWmV2 0Wzw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FZTIIry/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49452580f46si135892911cf.417.2025.05.14.16.42.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 May 2025 16:42:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="FZTIIry/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFLj6-0001ZW-Te; Wed, 14 May 2025 19:41:29 -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 1uFLj4-0001VB-If for qemu-devel@nongnu.org; Wed, 14 May 2025 19:41:26 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFLj2-00034j-VG for qemu-devel@nongnu.org; Wed, 14 May 2025 19:41:26 -0400 Received: by mail-pl1-x629.google.com with SMTP id d9443c01a7336-22d95f0dda4so4136795ad.2 for ; Wed, 14 May 2025 16:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747266083; x=1747870883; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q3uOJ9bGmUfZ/+MJDYCtssXzNui1of7VtUuGRTJFrsY=; b=FZTIIry/cNKp1mDve0fuU7+1M1UJlAwnbGSSaDNdNSUgwSyFUXU3bXGW+8NIveuZ2X +/foBqeoUhf4SLq2M3dJxB52hA7X4supCgTkOW8N/u6fswjTFyH1eesWJyX7UwFb/6Q+ YHelknCNNoLT9SfLPxCKlORb8TcpVkr8s3YVvhR0XPKFPY5gpMcUgcF6r+h7rpQZtJip LnEJxW1+RML1GQVUdFS/qx/bHLtNkF/4S9B1194FwHlxqn6c0eEyzC4gR+jYrpgGn+8H fcA/5VFgyvKyzwsgoVKtmKBm3SJ5qAAMb6N8h6nb27ONlWEdg4ossevhlsTDADAr6pbq Jj/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266083; x=1747870883; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q3uOJ9bGmUfZ/+MJDYCtssXzNui1of7VtUuGRTJFrsY=; b=uCfuLTdpQmYDfT1V1E8FQS7ejVxahDrfBrzuCc25JWMfEED1VXE9+6HNQfVMEsEafj YNIVQglvMJTIpRlnb12AlsnkXmJQCHqeVqouuI4vb7VMEEO5tXl07dWVmkUNpynSDoXZ lhw1UBN6MzOEUMP2LEVAgVdh0/4Sa84s59g01O3w+yFhKvQYgQBh7vkbcWe8StsdpDDD zfAsXaU/cQQREv8IHiP1gyypV8efhpFDLrlPQJsPEJq8a6IMYKCxEIZ0NoKnuoKgKJT6 MdU9sPD2vJQoj2605MrB7cWx2kS5GxQQTEoIG1Iw5T0gi+P0QuDN7ypAHNFR3Lhfk0SB 7bOQ== X-Gm-Message-State: AOJu0Yxn8+o/sQyt/qXV3gmErclS01pHJ2BrsAVR4WV5r5TAmQk7zP7z 35TVAaRbHkEW4gJwzCoHdExrE+TYFSt3i27reifv9c/y58puzrbYOH8j8vBBaFJEF/X3Cp2rSHD jyAA= X-Gm-Gg: ASbGncvfBPM/+sfHU/B/qpPMt7dwKaHpuduFneCMzJ39QSVYp9aih8l3kt/4IxeLML3 qDhRYXaVJxOMf6NHfYjbZ5K1ffSj7infhRHkc9B5TRbNgOV4cscngc4O4B62Isqf9r0BYUvB0fI fIqwt+w3IyYGzXRG+mqtBULsCqhvkNkg8GzoPfThMFv+HmcNCb/ff6FKLLCnzhZE4ZMc7Yf4RIQ yYZuab2oQUE0W6S4cECuJuo035y0Jy6FSY9cZ/IAHDLc/iS8n5n6U+kLOBZw3iAstDywGQOOJCa 1GuTmGJrya7hLYKjWA7324yGtY73Xv4OIz2KU2Aro6Y7cjTtyBE= X-Received: by 2002:a17:903:1aef:b0:220:c164:6ee1 with SMTP id d9443c01a7336-23198129cd1mr89640135ad.32.1747266083245; Wed, 14 May 2025 16:41:23 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc828b4e4sm104583615ad.182.2025.05.14.16.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 16:41:22 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Michael Roth , alex.bennee@linaro.org, Paolo Bonzini , Thomas Huth , berrange@redhat.com, Richard Henderson , peter.maydell@linaro.org, Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 08/12] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Date: Wed, 14 May 2025 16:41:04 -0700 Message-ID: <20250514234108.3746675-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250514234108.3746675-1-pierrick.bouvier@linaro.org> References: <20250514234108.3746675-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::629; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x629.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé We'd like to have some unified QAPI schema. Having a structure field conditional to a target being built in is not very practical. While @deprecated-props is only used by s390x target, it is generic enough and could be used by other targets (assuming we expand CpuModelExpansionType enum values). Let's always include this field, regardless of the target, but make it optional. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier --- qapi/machine-target.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qapi/machine-target.json b/qapi/machine-target.json index 426ce4ee82d..e153291a7fc 100644 --- a/qapi/machine-target.json +++ b/qapi/machine-target.json @@ -244,19 +244,18 @@ # # @model: the expanded CpuModelInfo. # -# @deprecated-props: a list of properties that are flagged as +# @deprecated-props: an optional list of properties that are flagged as # deprecated by the CPU vendor. The list depends on the # CpuModelExpansionType: "static" properties are a subset of the # enabled-properties for the expanded model; "full" properties are # a set of properties that are deprecated across all models for -# the architecture. (since: 9.1). +# the architecture. (since: 10.1 -- since 9.1 on s390x --). # # Since: 2.8 ## { 'struct': 'CpuModelExpansionInfo', 'data': { 'model': 'CpuModelInfo', - 'deprecated-props' : { 'type': ['str'], - 'if': 'TARGET_S390X' } }, + '*deprecated-props' : { 'type': ['str'] } }, 'if': { 'any': [ 'TARGET_S390X', 'TARGET_I386', 'TARGET_ARM',