From patchwork Thu May 8 13:58:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 888611 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp15728wre; Thu, 8 May 2025 06:59:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU72RTuVl1MZ8aXUwcdflf2dAHYQXGw01HR0M6rMtPnZBRiwfvSHRzpPnouvPv1mjuDr2JziA==@linaro.org X-Google-Smtp-Source: AGHT+IHCv/iL3sZrVzzixAcfN/pIxEmE3JWvoRTX8W0b/vd6yDC5Ym4lmItI77v6ZaQsNfo6SX/S X-Received: by 2002:a05:600c:8716:b0:441:b3eb:570a with SMTP id 5b1f17b1804b1-441d44bbf09mr67867605e9.2.1746712756020; Thu, 08 May 2025 06:59:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746712756; cv=none; d=google.com; s=arc-20240605; b=ImQrsXd3OZkJXT21oaYg2mnt2i10mK64TBJKh6yH5+HZyUo0NGcSvyz8/e28Ug38SD 0lIIGCphKiL3Y2RMT1ub+YPjPsn/F6Adm5KlyKg+ai5+8QB1knyZlsW3Cmr9MTEpaYxg PfsQSfyGu7UgjeHqgsHP748yiRj4effm17r+XV1roXLZUz1YK5a//VUSax6yTpo/eoRi nxo/80p0psN9mU3JHJqRFJMjAyObugT56dwVW41NzEdjKqnDulymne4rXsBnAs2hFvWo vA9yYB8+L0aqNoPpvRlkNF+cEctbv477VKr1p/bEDPjdodKHstct6gx6yCAeQbr5SF2y qt8A== 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=V1PHACAbgmRuDX4OOL1QlvKwoiGRLzXDKLV0aKBXgSE=; fh=VPDKvXphlzrAHtF5IZGfz8mM8uIiNpJob6FdHOyzE4M=; b=c8bEdjw4kXwJMuMVhyd6SQcPXdN/CyRF5cmkJGD3q4UUp8TMA8+WW3ShNbjqoAtxI+ lxnQJWh6JXDlVzWrrlHdRrNMAKACnKZB05o03ZKoOW0NudrsiPlLQWs0F2r2HtfrAq1p 6sUszb/Bz+UKHSuLfyypoKOjcSyHPxethdKBgHorRjaxuyHFj2ycWIaV+RGLUDzvW7+b 84SvFrLA0lImZkBaf9luqshGM7uF18vpfXbhNuYp/6zrrhUZDlFTKltWmF2mP3WzARLT Clg9K6+GYc7EVjlBDfeXzif/ddr9K0eFobo5v2TkR2HDbUCz4O7jsl43wQ+OMS2wBAo3 pTDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=DLKa1Er3; 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 5b1f17b1804b1-442cd3b9409si19688625e9.150.2025.05.08.06.59.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:59:16 -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=DLKa1Er3; 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 1uD1mA-0003lE-UO; Thu, 08 May 2025 09:59:03 -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 1uD1m5-0003Ub-GJ for qemu-devel@nongnu.org; Thu, 08 May 2025 09:58:58 -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 1uD1m3-0007Am-Fd for qemu-devel@nongnu.org; Thu, 08 May 2025 09:58:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746712733; 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=V1PHACAbgmRuDX4OOL1QlvKwoiGRLzXDKLV0aKBXgSE=; b=DLKa1Er3m4Eem4LFrxZurY3vL2SSow7FeVc84L5XYB14wQeTdyifucODhEfA14CYLo1wqz 27pQ1f9FCD4vYiaXXFEqvNoOBVKA98fvHzCElCjgA5HUTYqUYPS2l9qwY6vgtUyLVE9KZj 3wdwDR0EeZuOTwRqlLv9H19429E8L2k= 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-96-gAr3wLJFOfe7K-jygjmVgw-1; Thu, 08 May 2025 09:58:50 -0400 X-MC-Unique: gAr3wLJFOfe7K-jygjmVgw-1 X-Mimecast-MFC-AGG-ID: gAr3wLJFOfe7K-jygjmVgw_1746712729 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 655741800446; Thu, 8 May 2025 13:58:49 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.138]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6BF44180049D; Thu, 8 May 2025 13:58:46 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= , Paolo Bonzini , Markus Armbruster , Pierrick Bouvier , Richard Henderson , =?utf-8?q?Daniel_P=2E_Ber?= =?utf-8?q?rang=C3=A9?= Subject: [PATCH 08/10] qapi: Make CpuModelExpansionInfo::deprecated-props optional and generic Date: Thu, 8 May 2025 14:58:14 +0100 Message-ID: <20250508135816.673087-9-berrange@redhat.com> In-Reply-To: <20250508135816.673087-1-berrange@redhat.com> References: <20250508135816.673087-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.416, 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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. Signed-off-by: Philippe Mathieu-Daudé --- 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 541f93eeb7..3b109b4af8 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',