From patchwork Wed May 28 18:31:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 892980 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e0d:0:b0:3a4:ee3f:8f15 with SMTP id p13csp165774wrt; Wed, 28 May 2025 11:33:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXcJUcKDycXQjMiVTqfmQwfPfNussC4nMuB1vPJg/BqrLM16AQC/TPHpyXS7A/xNOKJNH4l4A==@linaro.org X-Google-Smtp-Source: AGHT+IGo+xswdF/V1lEJ4aORDXPX4JmchVEWLShaFrUlcnI8mUZZp3gSZv/rWQohTyPmaFa+Dwpa X-Received: by 2002:a05:620a:4628:b0:7c5:d71c:6a47 with SMTP id af79cd13be357-7d09877f69fmr106060585a.8.1748457211189; Wed, 28 May 2025 11:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748457211; cv=none; d=google.com; s=arc-20240605; b=gCRfmMsappLsebSshgflzOl1fE4asQko3T2Y0SBDmAo3ftEeGU5uWgOFVp6Am3o9m8 OO9ivYFcNMzmW/kQiaY51micnC9dp1bPnxuTiRQaVZZwH6BnjiMzMA8lotwPHriIy6ic pBiownM3aRXjUyzXseLYL+TZ9xHHM9S8164NPLYDuTIe1dfhvg/4raXSkzJA51oBayYd d0mpDfHTJ/zBJgf5PGdGWkbOQv8feKkcvQf+NjqnQxfZDuLnwbl35Y6Ug9OWmcetqWUS XTeRNK/flqjEBrITl5K3iBcPMK8v+/QqXad23tDAE8OV3HsD+YUxZKqvfV9uqUXlgyT9 HUAw== 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=bzGbDPuPtKL3+PVyexgER43w1lPw+++eS9Pps+0kaZA=; fh=/4yIF9YJ7DywfD2IgUflNexUgXflzOFcYFN7RY5q3cs=; b=NYY2+vtVCnnrZacCoE/jGw/nbHwQ9Mz4OumEc15LjgcQ/rF6jRdZklf92ZpcbweoEx /dOmnVNGapl1FqzE1Vpv2SK5/p0xLglE+kC1Aut6kugK0D+TRQVgXUxDFAzhVm2Ij4lM Vx+DO+aZWm6WK1tc1k/2zqqhIQSR9l+tBfk4YS1h4Kn3ebGYB5b7sFX4qyQMrchhTjYP 5JccKMVagKfPu8cvdrfyMuYBMbHHx1mMrclnFCyojHVFeUN7tvLNKJ/n6IpSb5fBvc7F pu0YucVVQZ03MdzbbuwdlDuDwLXTCQC7LKqsRHtaFy6CX42WmxifOnGhkfqLm2/DxSM7 cLiA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cRX4tn1A; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cfb8204a08si179227485a.136.2025.05.28.11.33.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 May 2025 11:33:31 -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=@redhat.com header.s=mimecast20190719 header.b=cRX4tn1A; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKLZl-0002d6-R9; Wed, 28 May 2025 14:32: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 1uKLZV-0002MC-Tc for qemu-devel@nongnu.org; Wed, 28 May 2025 14:32: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 1uKLZR-00072f-Dl for qemu-devel@nongnu.org; Wed, 28 May 2025 14:32:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748457123; 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=bzGbDPuPtKL3+PVyexgER43w1lPw+++eS9Pps+0kaZA=; b=cRX4tn1Ak7WpywVMjlfeGPMMZ27l8O72XlYaE5vT+eA4povNgY+bh/X/m7iYqOWTii0NLj GIqOsUwlRNNLNJM1oYOnUcgFtfwBmsiTrwRRKaVGlEls2MrxISFfBAiRMv1dnR9K6cbRDT q/Awzj/lJlgz3n66NMKBo4vAsgxSVH4= 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-156-vMXuYm5kOryv72DEcEFobA-1; Wed, 28 May 2025 14:31:59 -0400 X-MC-Unique: vMXuYm5kOryv72DEcEFobA-1 X-Mimecast-MFC-AGG-ID: vMXuYm5kOryv72DEcEFobA_1748457118 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 8329E1955D93; Wed, 28 May 2025 18:31:58 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.38]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 38B9619560B0; Wed, 28 May 2025 18:31:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AC38621E65E7; Wed, 28 May 2025 20:31:51 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Pierrick Bouvier Subject: [PULL 08/13] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Date: Wed, 28 May 2025 20:31:46 +0200 Message-ID: <20250528183151.2839034-9-armbru@redhat.com> In-Reply-To: <20250528183151.2839034-1-armbru@redhat.com> References: <20250528183151.2839034-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.904, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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. This is not a compatibility break only because the field remains present always on S390x. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Pierrick Bouvier Message-ID: <20250522190542.588267-9-pierrick.bouvier@linaro.org> Reviewed-by: Markus Armbruster --- 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 426ce4ee82..d8dbda4b50 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' : ['str'] }, 'if': { 'any': [ 'TARGET_S390X', 'TARGET_I386', 'TARGET_ARM',