From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961080; cv=none;
d=zohomail.com; s=zohoarc;
b=PX+Kyx2AXE8lmGlqsqRrFXFzTsqflAzJyQHiZ/Abw832svz+SE8m7NXwtlY9Ql/3E5OBpdm/4ByZW96aEdz4RJA53aUju3qa/vvT2UL5oOBrGkXLWQlRlDvSupQDdwg8Sv0BQtKyEUk7ry8Q5hzZUA9myjj0WGJwDGWYQuvNrDA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961080;
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=tO82mELrC9ge/485uM+xBiac5JrZdcxe00dmNBeeW5o=;
b=MZNLx4Pk+sCh6mgZNKQcTZuqXJIgjD44P3BWHDDVGKMKJGw6CJK486RqkQPM0QF/2rm75V6GNLpO8uHE0xUkQwaQRwrf8wRTpIfJSTX/ksFsGsaoT48pXGEx/f5A3T4uguaG7CLKdQBO2H/LA/P1g+F9tUviblbHmBRScBuf6Eo=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961080221854.5563629318059;
Wed, 15 Jan 2025 09:11:20 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uX-0007LW-Ki; Wed, 15 Jan 2025 12:10:33 -0500
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 <philmd@linaro.org>) id 1tY6uL-0007DN-Bx
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:22 -0500
Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uJ-0006Vm-L6
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:21 -0500
Received: by mail-wm1-x333.google.com with SMTP id
5b1f17b1804b1-436a03197b2so49909065e9.2
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:17 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c74c475csm30575235e9.20.2025.01.15.09.10.15
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:15 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961016; x=1737565816; 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=tO82mELrC9ge/485uM+xBiac5JrZdcxe00dmNBeeW5o=;
b=KBxokSMaGDjGsnT6P1OT9RXr9xfywnz29iFe6xWnfNn3WxkV2DEjMd3rzauSDCLA+K
/txwqlWg2MTgpVknnjcKfyZ+7GbBpwwX0KWrrNXhN7zMi/6TlkKAU3XBBKCX+iCRnGh/
HYAmp6W0DujcHxUn+XUWWapMaGdQzU7Eleyb6Q+qTcV0Z8n3hrrelN3pMbycDM5j97mv
/xO39nAr2zKN4Tx8HXBGL6ZDFMzP7qYom6UUKtOtV1V+O+sgkoO5gQ9Dy+fKwI4CBU5o
y7w8uru5kFGAnM5a9gl2GY+dtlv2pTYo5xn+82kGu6eu9pyYnpuAWuFAWt2iOI6oW3BO
U9Dg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961016; x=1737565816;
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=tO82mELrC9ge/485uM+xBiac5JrZdcxe00dmNBeeW5o=;
b=sVrpPC78b0hAdGGHAx7teP3vNXRguIEAtcbGOzrwyf2vUNAcQvnlcliAlPkc8lAi5E
oDRTCcgrTKLaJfUlssq6Ghxi+bb4wIg5vfe7lWahGxE5BacSWiK9LNTCaJTTMkH3obEY
rjbo/rd0UrAPYafYe6sb9VGIhzsoRkXyxQiAvjlpCoGwwyX5/u+285G62ViGTNK/f1j0
vD+9Kd1CZqH032tG3khtL3g2lQf0nOFmV6Ua33BFNbbuhsdolcpMQQPfEiIt51QBCIgb
m/I+9xu6bvYRzeDqg3etAAsc0sKuw5plhdLa/LLbqVkCJUxH3H1g0qWtnF0H4f245U/L
H9nQ==
X-Gm-Message-State: AOJu0YwJkPWl7M4ZlhsUifY0BvXhvK3HKBUg4O3/zFfAntY1Ah9p7mJ4
89igiSIPHaZDaGU24cSpN9XhXuWzuh3gDO0a5xit+AuqZsSCMVy3CbKr3GVPz456TEZAWPanMSL
oAAA=
X-Gm-Gg: ASbGncs0UuL31t6kdCwdiutGRkHwzrJyJwWBkBusPYCAeG8fNAUcDdPYZH8eTot1mK9
wu7gwLhxziDhAloeNW4elEX++syr2D+HfDGo0LUT8bfHq2wYaAmSvKb44niQGNmq75U2wRBaa0G
+5uKWlkQamTC8n3NIlfKsSUkznhcIv/WEPXKYK90nPR+/JNaLnRERG7yoi+6qwN+CepUyBNsui/
JJXUVkxesjhjoXOylqGQA+QvvfNcPj/KBqthUFs6zngIOT4dg3yjJN4GWttZebkZmLdFrjogvv3
jFUmRObrHyUpB0rGuwaHuhEIhptnhKVpqaY+
X-Google-Smtp-Source:
AGHT+IFiGSzmwCxqFZ/xX3I4s/b9Xp4asSsFxqy1N30kvRoi3PwEH+40dargU28XdMb6eIywhz2jmQ==
X-Received: by 2002:a05:600c:3ca0:b0:42a:a6d2:3270 with SMTP id
5b1f17b1804b1-436e26f01aamr233136665e9.21.1736961015906;
Wed, 15 Jan 2025 09:10:15 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 01/13] hw/arm/virt: Remove deprecated virt-2.6 machine
Date: Wed, 15 Jan 2025 18:09:57 +0100
Message-ID: <20250115171009.19302-2-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::333;
envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961081242019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
docs/about/removed-features.rst | 4 ++++
hw/arm/virt.c | 12 ------------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index c6616ce05e5..813988fad4a 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,6 +1065,10 @@ for all machine types using the PXA2xx and OMAP2 SoC=
s. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
+Arm ``virt-2.6`` (removed in 10.0)
+''''''''''''''''''''''''''''''''''
+This versioned machine has been supported for a period of more than 6 year=
s.
+
linux-user mode CPUs
--------------------
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 99e0a68b6c5..3bb8a9c7bd6 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3606,15 +3606,3 @@ static void virt_machine_2_7_options(MachineClass *m=
c)
mc->minimum_page_bits =3D 0;
}
DEFINE_VIRT_MACHINE(2, 7)
-
-static void virt_machine_2_6_options(MachineClass *mc)
-{
- VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
- virt_machine_2_7_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len);
- vmc->disallow_affinity_adjustment =3D true;
- /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */
- vmc->no_pmu =3D true;
-}
-DEFINE_VIRT_MACHINE(2, 6)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961073; cv=none;
d=zohomail.com; s=zohoarc;
b=BMnJpqJG9bNzub32TkSC3sfPs78tMsbL0xnkUhD890BxzK6FrXm+yDLP5lvmD/bZUDmEuXHMB3LpIdxR5JFDqElB4Ks2dMLFwoU+65yE1qT776RXD6Ugfs4LIxY/UsTpy6NQTFH/S3dQt/eYPoq0vsJ4XAbkwUpB98TT23cKigY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961073;
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=pJ6BBYQDvZ7gZ5xmu7ZLpmPZjx7/EtZQE26i+5oao3w=;
b=Lz2CgzAOU7J7M/HinXOkMPHGjvSbNQGli322qwEhwbpJp4dE129D5LROH1nHUc41xltNEVp6NUTTVJKznAKPvry8T+lNJuTaBirvgpoNq6jzVr0ZvpiGYBTVi9CyfTkapQGu81GGJ+mILF5t4ZIHBpiaiRxecfUp86FcWR/oDPQ=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961073075504.15554481533104;
Wed, 15 Jan 2025 09:11:13 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uY-0007N2-Rb; Wed, 15 Jan 2025 12:10:34 -0500
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 <philmd@linaro.org>) id 1tY6uO-0007En-Vz
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:29 -0500
Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uN-0006Wp-DP
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:24 -0500
Received: by mail-wm1-x32f.google.com with SMTP id
5b1f17b1804b1-43623f0c574so50095675e9.2
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:22 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c75290a2sm30508755e9.29.2025.01.15.09.10.19
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961021; x=1737565821; 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=pJ6BBYQDvZ7gZ5xmu7ZLpmPZjx7/EtZQE26i+5oao3w=;
b=NFZ+9t/lvyR5wHBtZc/Vgx8NmuChbuOH5YgHmTPErawSpCJpE932V5944AMzYSH+RH
5fUCiM8Jyy2lHVdggxvpwLHzOILNkgm1FvkG5Dlxh+YcpEd5qrJ+BLyaDvZyEH4YdmA9
avhOTY5Czypta714qoPW6ut4tfNmnuEFKXOtMdXL00zzDCQjknDOgE2m9cGpvqCv4PTU
Fj6k9PosUBIvfeYsj3xiCoOajprmtk4Tm9xef7Ih/WxHQaqeY5Qf44pLBlnS1ch1dyi+
jHg0mq13n9FtTdBHX/CPwXhg6O9c+QsqTovgay7Mytdvxh9NJL4uR5CDD6n2vPjWI2hj
W0aw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961021; x=1737565821;
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=pJ6BBYQDvZ7gZ5xmu7ZLpmPZjx7/EtZQE26i+5oao3w=;
b=t+0d+IqtCkUmfH1OKybJyszqQoYxmduLG+HRX1rb7Q0pVA7LxTCGVqj652nkiqigny
gVHi9RAmt81k/RoqZ99GzIHBF2CNDsB8diP0w3w6aHfmSoGWlsa4Ek5dHPQu38Vhmq0+
+tgGLYK/joKPK8m7vy7dfBdlBE5EomcVUgq7d4nqme0DftkPF96puUwnjWJ/yv+eWUDQ
JcY23t6Yn5HRH5VtCvD6wqHN4ersTL/pzUu7TWiBIVPe1AzPU50Up0DUdt21cPh5qBwr
1CUpfL/OI3DhVS4BEV8oHSDXJ2Gqcn0oK32nP5110Syy8eMu0FJlr056/0P1sgD7wMtF
jCew==
X-Gm-Message-State: AOJu0YzEtZb06oNihvCHlAwbwJ7kRgG9ct+LK2xlosnXb9AXFiOdtnVE
63/XanWWZLkXiekgLNjUE961Ve5/KsrkYTjxrAJs5lcnlxDAu5/PSZ23dBQUhZYCk6wssSuJVP0
eaVI=
X-Gm-Gg: ASbGnct54TTFc5wzo+0wV02+YjRIcn1SqbEK6Vn+c23A55f4K5+iXdHNGEPvjCaQYfx
Ul0th+/AhHM0j3APbf6OC9k4zgHJZwH3mqzVRul6zVnttFb+cK1UciDF7xkYTVXno+PuI9WBDOW
v+q4sx5yeCf77MgclMVyWaaj8U1a9FIrZGH254NjZyVgejpHffwiLgr6eZ9uDKjRARuFtP60YAN
XscstZUSvtQHZLMkFmT/gaKrx5fUeCVbZKky7LKtsuniC9ZCAaRVejY1tIhvLrTtyjTs45xLyJp
LG4tS810KYN/2oU1q1vI7pltpwv8SGRCWekN
X-Google-Smtp-Source:
AGHT+IFdwR2V+vQPPucU2EZivG4J7Eb3Bpl1K+qUNUrrw+/AMe+lhzD1LKKd71s4yVkGQ4K//lVNRg==
X-Received: by 2002:a05:600c:3b8a:b0:434:f270:a4f0 with SMTP id
5b1f17b1804b1-436e26dda80mr229248135e9.21.1736961020558;
Wed, 15 Jan 2025 09:10:20 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 02/13] hw/arm/virt: Remove VirtMachineClass::no_pmu field
Date: Wed, 15 Jan 2025 18:09:58 +0100
Message-ID: <20250115171009.19302-3-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32f;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961075099019000
The VirtMachineClass::no_pmu field was only used by
virt-2.6 machine, which got removed. Remove it and
simplify machvirt_init().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt.c | 4 ----
2 files changed, 5 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c8e94e6aedc..27c5bb585cb 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -120,7 +120,6 @@ struct VirtMachineClass {
bool disallow_affinity_adjustment;
bool no_its;
bool no_tcg_its;
- bool no_pmu;
bool claim_edge_triggered_timers;
bool smbios_old_sys_ver;
bool no_highmem_compact;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 3bb8a9c7bd6..0080577e1a9 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2262,10 +2262,6 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, "kvm-steal-time", false, NULL=
);
}
=20
- if (vmc->no_pmu && object_property_find(cpuobj, "pmu")) {
- object_property_set_bool(cpuobj, "pmu", false, NULL);
- }
-
if (vmc->no_tcg_lpa2 && object_property_find(cpuobj, "lpa2")) {
object_property_set_bool(cpuobj, "lpa2", false, NULL);
}
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961063; cv=none;
d=zohomail.com; s=zohoarc;
b=Gxuyjh2w662kleGl4qIqBVFp1oCI4xAi87kJU5BUGSjWZWx8s/SiZdkn79q/hmgO9TBYnhemcSd3inb1yTmsQm57YMp247r58j8rzbw0+EXFigAo1/yI1XSfUOkPdrG7jEnm/JjGaHuLwEqLyAh6L/8uVPp+26LRSLSsjei46YU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961063;
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=KxP4KhsAoIrkijG1kO5uGQ16mZCFRr5vQmqFMkBbKho=;
b=J3ZpcKvvkpc2Q0Cy2MyBkCgV+XjSjACYW7LXhXcyO+08+JDo2VvPuUpw0+1nnnVwYXfDrErT+Go4T5fKgraw/B3BJZU5KwwIzTZdmxW3jBpEW/exZ7v8WjEbNpcOgKACAd+V+M5JuFvsCzthQkDRlbykyWP74wHZ71MgADv9YRc=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961063770717.8145932975527;
Wed, 15 Jan 2025 09:11:03 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uX-0007Ld-No; Wed, 15 Jan 2025 12:10:33 -0500
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 <philmd@linaro.org>) id 1tY6uS-0007FI-Mp
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:30 -0500
Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uR-0006XD-0R
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:28 -0500
Received: by mail-wm1-x332.google.com with SMTP id
5b1f17b1804b1-437a92d7b96so22167285e9.2
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:26 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c74ace90sm30491535e9.16.2025.01.15.09.10.24
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:24 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961025; x=1737565825; 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=KxP4KhsAoIrkijG1kO5uGQ16mZCFRr5vQmqFMkBbKho=;
b=bUzX4RRfcRFBpDxZOruj8TseBkNkL9m9X5j58p1HMr5yg7S5g4UeN8u9RqcdMF3hQJ
p4xyqRer14BRBJ8WV/JJpnQlkZothot5pR4Ksfsz2dwbjRbi3b4Q53AGk2pwWB45cRIf
/9ICOML6iIKKzzwFeOjxlju3//kJbLkeRQYpBE71NCMQLCOUNEsT0Lkz9BDc/RRQGWXM
JE8mb8sE4XLq2lK2jcby4VvYDatWMLtOYdPOwWWNs0R1JAZkEJTRJTlCUV2kJ0cssGO/
KGuF1J5Fr9p5ooK+dL+UG9mxQbUWQRv3pL2k+yvlKxh9yXkweMUImum9cL+wnTKkEHh/
wtXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961025; x=1737565825;
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=KxP4KhsAoIrkijG1kO5uGQ16mZCFRr5vQmqFMkBbKho=;
b=OnFFardvWzRHv04LXKRikMxNdjZ1wYzmAhwIrMUV+WAH2kZZM2241yQ1K6DoI0JxUU
gHDbwW+KVCeTxVZ7cAYoSYoJFe5IrAwXAc5C4m51alMXCB6q0sVJ3cIbPImKTTE/vPJw
gwS7OJEHhgfQyqpDC6y5MVE6jrCVTUSvOLTs8mpiHEFIdk3NUoYYaYqmaPlvyBdJc2OW
zopmKJ1XQq4TQRTHBfhYixOTeZkKIkqaL7iW5HIcAqve00AGHe0SlkJvAD10iciKdqRz
tIP6LD2NW/dJWueu3UhbVcHCT9JVN7dExRUnWX+7hdW64qGdP42eMJCDzbHFQqub1LkM
iUOw==
X-Gm-Message-State: AOJu0YxzcPxwdW2a204haXedxoiwZ3MMr7A56ntWoODiTLuW94KnlC0k
tNaIGKkrWqqcnXBg4x62nURbAjp0SoBqYHMHZY5saNaDcg08dsL16uzOgYrKKexATHspMazkGGW
8pN8=
X-Gm-Gg: ASbGnct5XWjk7olG4NlLcuHIrNBtKY8now70wJ7DOkxVxsN2gWRfYTc20T3zRH02foS
pS0/yRcxcNkqWeoXHFsoteKvKB4Qt/xU9v7ur0gzwR2vdAKWx5tmSipa9urSfYRinn1PcvmZO5W
yxqWfwxazPyLibtCv2JtMbmP6Zv88mfJiuZDfXbICEZgV1Qb8W3TNPvdl68TFp3w5N7jZFpFLtv
FeHRIpI67T8IViNEhVOiRCGkWlhJrZbpZ4pqUyeKRIhlqvtDwY4qL7wFXFwxlxdpTbjamQ0a5Tp
GZYKkQIi+lwAkW1CALoBTiw7ZiEta8d5ryLM
X-Google-Smtp-Source:
AGHT+IFgYAldhXNjIPEym55kT+EMyHeyOv6QYpJ/yAVxasdL+K3HD8c/cP6DvQLSMsrp/P/2YjL9DA==
X-Received: by 2002:a05:600c:4586:b0:434:edcf:7461 with SMTP id
5b1f17b1804b1-436e26f135bmr299719435e9.30.1736961025128;
Wed, 15 Jan 2025 09:10:25 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 03/13] hw/arm/virt: Remove
VirtMachineClass::disallow_affinity_adjustment
Date: Wed, 15 Jan 2025 18:09:59 +0100
Message-ID: <20250115171009.19302-4-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::332;
envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961066234019000
The VirtMachineClass::disallow_affinity_adjustment
field was only used by virt-2.6 machine, which got
removed. Remove it along with the GIC*_TARGETLIST_BITS
definitions, and simplify virt_cpu_mp_affinity().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
include/hw/arm/virt.h | 1 -
include/hw/intc/arm_gic.h | 1 -
include/hw/intc/arm_gicv3_common.h | 3 ---
hw/arm/virt.c | 16 ----------------
4 files changed, 21 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 27c5bb585cb..5d3b25509ff 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -117,7 +117,6 @@ typedef enum VirtGICType {
=20
struct VirtMachineClass {
MachineClass parent;
- bool disallow_affinity_adjustment;
bool no_its;
bool no_tcg_its;
bool claim_edge_triggered_timers;
diff --git a/include/hw/intc/arm_gic.h b/include/hw/intc/arm_gic.h
index 48f6a51a70a..f5e6e5e70b4 100644
--- a/include/hw/intc/arm_gic.h
+++ b/include/hw/intc/arm_gic.h
@@ -68,7 +68,6 @@
#include "qom/object.h"
=20
/* Number of SGI target-list bits */
-#define GIC_TARGETLIST_BITS 8
#define GIC_MAX_PRIORITY_BITS 8
#define GIC_MIN_PRIORITY_BITS 4
=20
diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3=
_common.h
index a3d6a0e5077..fff5e55a97d 100644
--- a/include/hw/intc/arm_gicv3_common.h
+++ b/include/hw/intc/arm_gicv3_common.h
@@ -45,9 +45,6 @@
#define GICV3_REDIST_SIZE 0x20000
#define GICV4_REDIST_SIZE 0x40000
=20
-/* Number of SGI target-list bits */
-#define GICV3_TARGETLIST_BITS 16
-
/* Maximum number of list registers (architectural limit) */
#define GICV3_LR_MAX 16
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 0080577e1a9..2a2a0bd9154 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1760,23 +1760,7 @@ void virt_machine_done(Notifier *notifier, void *dat=
a)
static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx)
{
uint8_t clustersz =3D ARM_DEFAULT_CPUS_PER_CLUSTER;
- VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms);
=20
- if (!vmc->disallow_affinity_adjustment) {
- /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the
- * GIC's target-list limitations. 32-bit KVM hosts currently
- * always create clusters of 4 CPUs, but that is expected to
- * change when they gain support for gicv3. When KVM is enabled
- * it will override the changes we make here, therefore our
- * purposes are to make TCG consistent (with 64-bit KVM hosts)
- * and to improve SGI efficiency.
- */
- if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2) {
- clustersz =3D GIC_TARGETLIST_BITS;
- } else {
- clustersz =3D GICV3_TARGETLIST_BITS;
- }
- }
return arm_build_mp_affinity(idx, clustersz);
}
=20
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961080; cv=none;
d=zohomail.com; s=zohoarc;
b=S5AFQy/+YWPU76OtdqALv65BJglh1mIJZL0ygq+vHv852w0Kaec7ql3OWAFIRT2mp+2bCOI2S2dDcJHMhqLmrF0DWsrX4t5AJ1rSz+/YDp1/UD2pXA2lfeRDhzro+zdsenXUe0o7YhIHQDE256aUuYHyOUAyms8w5li4KvEjvis=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961080;
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=EkO7QKHSSU9JZ7UVLVh7P3hTPCbkidV6rATGTGJe5AU=;
b=WLp5O78DBaMVOXEa41iIKkkuJv26w43yGNs2jyeW2GtD1D8frY+JcLRZWVLhE0kHTp3xN1jPtMwdteVKEafwdSo12HUEKyxJiAzRfkD2tEcqYGioEv5HRJP3fVSOevmAUuwhhDqf00zYYfe4Bcxh5wQMdvjNPnE1JJxbXW8fk4A=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961080067264.0730481252559;
Wed, 15 Jan 2025 09:11:20 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uZ-0007NL-Q5; Wed, 15 Jan 2025 12:10:35 -0500
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 <philmd@linaro.org>) id 1tY6uX-0007La-Ba
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:33 -0500
Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uV-0006Xk-QL
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:33 -0500
Received: by mail-wm1-x32e.google.com with SMTP id
5b1f17b1804b1-4364a37a1d7so71877975e9.3
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:31 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38a8e4c1cf2sm18303571f8f.99.2025.01.15.09.10.28
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:29 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961030; x=1737565830; 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=EkO7QKHSSU9JZ7UVLVh7P3hTPCbkidV6rATGTGJe5AU=;
b=fD28RMNhfEmp6c1uGGBQPLMyvqdk5IkfpWs5Cc2v/TuZAY4sDMcHcCy1HC/wALt/JQ
vDv1odHdzQBfl+/iz8BDtgkkkCfeKDbYERMv+xjFqCNe22fmKgRkU8Hxk9Jh4/NzidpU
z5HuZv6u4MxEP/6BfwjVxVMhKv9ZgfEfao98sVA3ZbJEkdxDqGg+b9/o5p8Cwr98rNh4
/knH7yno7qpCKqRIZhQgnPpzbQiCNEAIoo59SNmv4VVhlP6Wru7K0jFCjz8Of6zr1I4H
2Bn9bHCNCSpFeBO6BnlTUIhYpG0VJ4wP195bsE7lFU1PzQWpwLkf0qYR/Su7M/XwI6/U
ldNQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961030; x=1737565830;
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=EkO7QKHSSU9JZ7UVLVh7P3hTPCbkidV6rATGTGJe5AU=;
b=sOjsQDWbZROLl2dT9ZAUhj53ew1WO/X+/opxGO3FvMM0v1qhyftrbnEjoY7I9f97uC
cAW57FV+qx5hnl55qJRAyWJC2ANSEzq5A5xC+06CHyr2/AS6nqc23Nyq531xkHTZP4G4
iZnLibjIxpbAQTLkeKAvF9n+EukPw412TLAWUtV9BGoAF7Mu44cLco329IEPfFUIr6RO
JYyzYRyXgwvFDiNHrTf7lGRKtBRGyD8H7UJzM52WjZgmkVE1ry8kG/M6u5K/nSw6lCK1
m8dsYgQVdK0w6nSUyC+IiFd/pbLKCUvjhKgyule6IK2Hs5YjRqita3/XfUEPAGMuam67
sQ4g==
X-Gm-Message-State: AOJu0Yz2JURpbCbgXUlPvtKobXt0Rq3CUEtW260LN3B1i4L46kiYtmBx
mX1Q6+D6uPFK7xY4guEhL54kVvvcsF7YBuV50M4ZGKpXoVZxP5l+37leKhgyZyd0jPYLqhQKU2j
mSg8=
X-Gm-Gg: ASbGncsPlRB6/WWHTj6R3wUNpnMWys+eA4okaXueAAyEQf7mCCjsPkMcOvFX8t+Nls1
iuzlwYyH7NDB5REJcLZu7x98B9BWTSL9QRRV1dcmq7sgKsC2VwhMa/0/hmDg8C+e6FIyvIcp3eR
95jPm19RcEcV9zI6YNgRizuNPjnxaLiIyfDyECRB4s+F6AMAWmYjjEp8lR/3F6aOONG0PDyYgdX
lglwYtXoiULOFQ7vHEObgUPXUWTtcCtvPJHTlWFD11F8vmqnkIwwfPs9doIOblGnb4qh0rhviIC
lwxX723WuFAddHMVL6Z7b8P5kZtthNag02g2
X-Google-Smtp-Source:
AGHT+IHt86hKvlML0gTfYHRjrnjDz+M7M0iTGTXKTpXHkkydCvFPrk3Zi1j6+jGrVxKADfXOe37azQ==
X-Received: by 2002:a7b:c315:0:b0:434:ffb2:f9df with SMTP id
5b1f17b1804b1-436e26adf94mr292003035e9.17.1736961029857;
Wed, 15 Jan 2025 09:10:29 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 04/13] hw/arm/virt: Remove deprecated virt-2.7 machine
Date: Wed, 15 Jan 2025 18:10:00 +0100
Message-ID: <20250115171009.19302-5-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32e;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961081250019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 6 +++---
hw/arm/virt.c | 13 -------------
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index 813988fad4a..435f081d805 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,9 +1065,9 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` (removed in 10.0)
-''''''''''''''''''''''''''''''''''
-This versioned machine has been supported for a period of more than 6 year=
s.
+Arm ``virt-2.6`` and ``virt-2.7`` (removed in 10.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''
+These versioned machines have been supported for a period of more than 6 y=
ears.
=20
linux-user mode CPUs
--------------------
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 2a2a0bd9154..7747dae4dc7 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3573,16 +3573,3 @@ static void virt_machine_2_8_options(MachineClass *m=
c)
vmc->claim_edge_triggered_timers =3D true;
}
DEFINE_VIRT_MACHINE(2, 8)
-
-static void virt_machine_2_7_options(MachineClass *mc)
-{
- VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
- virt_machine_2_8_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len);
- /* ITS was introduced with 2.8 */
- vmc->no_its =3D true;
- /* Stick with 1K pages for migration compatibility */
- mc->minimum_page_bits =3D 0;
-}
-DEFINE_VIRT_MACHINE(2, 7)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961068; cv=none;
d=zohomail.com; s=zohoarc;
b=ZArGlaARv72T0yKze9Hi0LdiqoPf/HApKo4RGTkJwFp/E+idEZrO47yrh/mNggLPAeDjNS2LM3iGiDySMRT5WsxGOvTLRR7L8px1rEb2rs80gQDHYC5SZX1DosUDz3Wl1txaew9k/XE639Qy8yaA4mHsN1wpVCeC2RrX9Atu2Lo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961068;
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=ZpQYY+dgdMviIpUml6KdhqzTGvxqX3W0VvYn2a5rV6U=;
b=Czza2ISVo+wFevzkSZ1Pxpvo6ThMPoqFppWuAI6sUzCCUAGLlKOgZB6iC6wMGBFl85Hoke6yYHhpMtEdKPK16GmPH1o/DZf4CP5O78uddzuwwbGTPKCrotmuTzSjn/yvDWxsuRE2EMz/5S+h1RSAJBiy3r6ftLmstbIXk52iKYE=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961068478897.6071175092989;
Wed, 15 Jan 2025 09:11:08 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6ue-0007OU-B4; Wed, 15 Jan 2025 12:10:40 -0500
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 <philmd@linaro.org>) id 1tY6uc-0007O7-Dj
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:38 -0500
Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6ua-0006Yk-Cl
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:38 -0500
Received: by mail-wm1-x335.google.com with SMTP id
5b1f17b1804b1-436341f575fso74225935e9.1
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:35 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c74f9ccasm29516495e9.39.2025.01.15.09.10.33
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:34 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961034; x=1737565834; 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=ZpQYY+dgdMviIpUml6KdhqzTGvxqX3W0VvYn2a5rV6U=;
b=Ifu41O6QZhcpadZ39CgiSDcztnvchIZG5CgFd81aDO5YIc8SzlF7AzbRws8PZ11te5
X6PuDdfnm9UTncq9JRsmUQFTXmTjmNgRTNgxf0zcMPb7cUfIFU272ZIi1hFXfWOMbNoR
1ggCetkCMVuv83y/5ilkaO4wWf626Dlmh7CaTHCxLFKjDnUjU1n9wNEY9jgvHMAlycDu
i77WdYKNY1gkss1Y3B5MtBkyG7pR1TnUnrXJmDWqcv7B94mEyG0GNfPYb/sAR11jdzWT
ywtYbxhq6PTqMJWRfmhL8kKoSvWiRGfsU2oFyHoLUMfWoXshwGMsa/0DzUmhXhapa2cK
Skqw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961034; x=1737565834;
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=ZpQYY+dgdMviIpUml6KdhqzTGvxqX3W0VvYn2a5rV6U=;
b=NjRwu2mSuWRMvW+YLzd7SP2sVwj0eEVa3YOYgMkIDHMoANYXyQDjH3s0FTo3NgrH9x
W+JCBA2j05WVsYtpQOO2zw4rWnx4JCtanMgbTly707P9WdsJeiMhqsECSmlUx55MDgwR
Agz52JwuBBlxKxs3cUg1eHPrV0+LEIQ+1Tk6KH2UjbXEIPSiiS8rtyAUD2WjGbzwN3WE
5gd3ot5qrvILq51OGuvZe6VfPuOoAGak1QWaxhz56dqw58wT8X7gvMxs/wj/bDbKNIy3
io2uMgpfmBx7T9pQ7LF29NvugyH4qlzWr6ZllzMqRMg0s7DLdI04Pom5vvhExML1YBay
UJwQ==
X-Gm-Message-State: AOJu0YwEtD9PC8iKpeX3BDYXWdKX1Dtj+h/z7FQ9iAj5dkos09KV9Wnf
AN0lf1XtrH6Sd/vJtW0KWR9sbx8JrWrTEGGzzCAdZa3/34iKGF3fCU0MBDoSYBo4yaqLOyfra/c
x+QQ=
X-Gm-Gg: ASbGncupoUbCLS9OGoEyg8655GH0yaXB0NygEXKOeo/8JrGNDk5UnH3ln3zLIMTM4tf
lqunk4b8m/tIBbYYm9fy65WjP1wijgAZlULnvxSvrRz4nmSlWBnFO9/omZpAi4emrlKSK1/It5j
YkjGyUE4SOVSKAt16+nWQsZUihU/lYk6MSJuEiHfrdNV4A3BnWB9CQLbkzNylXUbdnypN5zirYD
Y8AIwYPAzVCydzggrVMUZj5QZnBX4syKLCCTvkpRbPU7YtdRMF+PPBrGDbUj90+XsKdYmy4+rTG
CurghKspXMPF6CE0XVIpMfzzQWet7Hgy/Mgq
X-Google-Smtp-Source:
AGHT+IHpWPvqjQwMeUSXZ98zby5MmvBkVROMrpWWhbVVWcttenbsUtuQjxj4Nd6K0F5i5WHPwBtMdg==
X-Received: by 2002:a05:600c:a09:b0:434:f753:6012 with SMTP id
5b1f17b1804b1-436e26aa593mr307632195e9.17.1736961034507;
Wed, 15 Jan 2025 09:10:34 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 05/13] hw/arm/virt: Remove VirtMachineClass::no_its field
Date: Wed, 15 Jan 2025 18:10:01 +0100
Message-ID: <20250115171009.19302-6-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::335;
envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961068987019000
The VirtMachineClass::no_its field was only used by
virt-2.7 machine, which got removed. Remove it and
simplify virt_instance_init() and virt_acpi_build().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt-acpi-build.c | 5 ++---
hw/arm/virt.c | 16 ++++++----------
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 5d3b25509ff..463ac09615e 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -117,7 +117,6 @@ typedef enum VirtGICType {
=20
struct VirtMachineClass {
MachineClass parent;
- bool no_its;
bool no_tcg_its;
bool claim_edge_triggered_timers;
bool smbios_old_sys_ver;
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index c9b13057a34..ccecea9e09b 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -670,7 +670,6 @@ static void
build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
int i;
- VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms);
const MemMapEntry *memmap =3D vms->memmap;
AcpiTable table =3D { .sig =3D "APIC", .rev =3D 4, .oem_id =3D vms->oe=
m_id,
.oem_table_id =3D vms->oem_table_id };
@@ -741,7 +740,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, Virt=
MachineState *vms)
memmap[VIRT_HIGH_GIC_REDIST2].si=
ze);
}
=20
- if (its_class_name() && !vmc->no_its) {
+ if (its_class_name()) {
/*
* ACPI spec, Revision 6.0 Errata A
* (original 6.0 definition has invalid Length)
@@ -974,7 +973,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTa=
bles *tables)
vms->oem_table_id);
}
=20
- if (its_class_name() && !vmc->no_its) {
+ if (its_class_name()) {
acpi_add_table(table_offsets, tables_blob);
build_iort(tables_blob, tables->linker, vms);
}
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 7747dae4dc7..d7a7cee79df 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3278,17 +3278,13 @@ static void virt_instance_init(Object *obj)
vms->highmem_mmio =3D true;
vms->highmem_redists =3D true;
=20
- if (vmc->no_its) {
- vms->its =3D false;
- } else {
- /* Default allows ITS instantiation */
- vms->its =3D true;
+ /* Default allows ITS instantiation */
+ vms->its =3D true;
=20
- if (vmc->no_tcg_its) {
- vms->tcg_its =3D false;
- } else {
- vms->tcg_its =3D true;
- }
+ if (vmc->no_tcg_its) {
+ vms->tcg_its =3D false;
+ } else {
+ vms->tcg_its =3D true;
}
=20
/* Default disallows iommu instantiation */
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961153; cv=none;
d=zohomail.com; s=zohoarc;
b=BHROcShvALATeJpUozsjp8HziyQb3EgNcF5dw/G7Xnn4tAv3JxNJfN++loS/uANaA0E7Ns5g3w6noTIcK076MdPdXHoQxQ5FGWUiKIebQDQ9X2s/HmGH5IYbUVzq5bUuJ9iywkiTka65Ce/NkPGmqujb8O4YrCoJe3cz/GFYqG4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961153;
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=KLyfo8A7IZIE7IOrZd9qH5+UHn+eynSluJZ+bRJ10/s=;
b=lt0qF/1HdbM0b8IJQ6uNBNXjAS3d+Xhcu217xZzeWlmsRz0mpM1SrUIHOOY+ed3cpXsEvVbV4e1RUpoPL8pcR4lDF87/D1cI3E43hLrZtiKmcQr1/vCAM7bd5GmfRqvle5/VsygYRyVq8NTjFcL7hlRsCKKcLM6or9R/oLl60H0=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961153462732.5242130018778;
Wed, 15 Jan 2025 09:12:33 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6ul-0007RD-Ax; Wed, 15 Jan 2025 12:10:47 -0500
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 <philmd@linaro.org>) id 1tY6uh-0007QV-C9
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:43 -0500
Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uf-0006Za-Tl
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:43 -0500
Received: by mail-wr1-x429.google.com with SMTP id
ffacd0b85a97d-38632b8ae71so42545f8f.0
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:41 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c74995f6sm30405545e9.1.2025.01.15.09.10.38
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961040; x=1737565840; 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=KLyfo8A7IZIE7IOrZd9qH5+UHn+eynSluJZ+bRJ10/s=;
b=Y1mof02fdBTswiEUSGVm4FqMYLmwpohZLULN7oTQyFOWLHNQf8cLAweM231D0tyEwu
EjaqkvRH6ah4T4z/cFMPPsHGyzBBPwWcU79KHWW1hGojhAK8eqQQifggW8MT9oq+UKkp
cSHjqx1Zwlzxhd/l0zrzzYUpAIZBGNn6KWOIdhdD0XQ37g6MgQiOjISb8zAWe/tJeo/U
6JYdTorirH3WDILqSEmYcRMA+O2CEVKd/xXIQBK8pRIeDioWC+1sQgsG+z+EXhPLvYHl
9bMckJ6FS9pzgrHgJsK4btSXaZsN3XFT73sRMsDffNPmJddu47d0IJx5NNqFooVDvvBZ
uOMA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961040; x=1737565840;
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=KLyfo8A7IZIE7IOrZd9qH5+UHn+eynSluJZ+bRJ10/s=;
b=r5+BzSzA2b4/bEfQzeFwy2og4uv45pj8NyfBHHmrVFGZTkU3cGRd3In8o7tyRJ2x4R
NjZgir9XzI8Rjue8s+b7l8meLVN/NxBgsqwabe1WP1ZOx+aLQ5LNkW43M3VHyy/kSCG7
r0IcdC82LnB9TJaIC6hkyTc2CSOWctrZb1Li3B6oIePfOeNwL7CizeMkT9nkGNbgf8lB
h9ryHMUqItr5eNOBur4dvnG2q9cUbVHY0WrWQ/EYDNQs4vpW0vAumfRQJon8jOKl8NZt
QFKOrRJM/kjn++nkgl7XvANEnNvt/aprmzlCw21wk3diCp0V03RkTvMgvb4LOdBFay8g
Vr1g==
X-Gm-Message-State: AOJu0YwDZcOfmJcIM3G1PmnTgponFCcc0NTBIkykAY+X2HPwBlRRxyTx
yqC+kTdhUzjvkpA3QMhwpEGaWBBqpxsUE3jQWXPzLSrl0rhyJTpHdOH+1llpyjCd7sbYyiyVnrU
fmuY=
X-Gm-Gg: ASbGncs1gITy66M10GhcSD6G3RzXHpdPcJNrhMTk51JviXUCXR8+JgwtnamiBiaBYQu
D3KfIf9KiudRjAc4UzkeV8Bcb6BXq4Z1ZZxGFcNS5H55mVS/iIBKZdDf8+C4gwU2U9B+0ssei47
siyxXD4iKBFJbhPzbSkX1gxYKYUImtbznUa0/ZESmljSTmV77eeC+8CpEDUU6ECqBHSKgBF+sHL
iJ7OTDKl0XoKg7nOs/oWsJgu2wC3DR1e/8YZQysNRn+Lp/6tOKori8gziyjvlsByKkFxyZWSyIN
PKEnzqTo+KCIKecvD0/PbkuWM7cUKgbs7V8q
X-Google-Smtp-Source:
AGHT+IEewz6G4VAcWkXSJWgHbrI3YcLVGLWnoWAclkHQ8MH9KvNFGDSsG0PllBaS1l2s+02bHlOhqg==
X-Received: by 2002:a5d:64ed:0:b0:38a:4b8a:e477 with SMTP id
ffacd0b85a97d-38a87306a84mr28026807f8f.22.1736961039922;
Wed, 15 Jan 2025 09:10:39 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 06/13] hw/arm/virt: Remove deprecated virt-2.8 machine
Date: Wed, 15 Jan 2025 18:10:02 +0100
Message-ID: <20250115171009.19302-7-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::429;
envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961155545019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 4 ++--
hw/arm/virt.c | 13 -------------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index 435f081d805..732ec2cd05d 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,8 +1065,8 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` and ``virt-2.7`` (removed in 10.0)
-'''''''''''''''''''''''''''''''''''''''''''''''''''
+Arm ``virt-2.6`` up to ``virt-2.8`` (removed in 10.0)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''
These versioned machines have been supported for a period of more than 6 y=
ears.
=20
linux-user mode CPUs
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index d7a7cee79df..4ec94190769 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3556,16 +3556,3 @@ static void virt_machine_2_9_options(MachineClass *m=
c)
compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
}
DEFINE_VIRT_MACHINE(2, 9)
-
-static void virt_machine_2_8_options(MachineClass *mc)
-{
- VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
- virt_machine_2_9_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
- /* For 2.8 and earlier we falsely claimed in the DT that
- * our timers were edge-triggered, not level-triggered.
- */
- vmc->claim_edge_triggered_timers =3D true;
-}
-DEFINE_VIRT_MACHINE(2, 8)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961158; cv=none;
d=zohomail.com; s=zohoarc;
b=P2z36KQPaNTkBohyeZ9lK3/RVBq+42Y6YfJkumfN3pQBrZOuKrSQ8NkAnXOsXI1Y2+BrekmHJYRUOjTA4infJXJb2L01WiG5B9NlKR0VzI95zavd6zFcmbQJnYpxZH4r2eCD+ap/gc62gT6WUAc7x/iv+9cEuSkeyOspIIWJG6s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961158;
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=+rpS4UoGMNFWvPB8UZ1XtPkvHJUg2YKopwCuDHPyLwI=;
b=WDsHwniy/oEyLlMdnBfGYvWOTC29cPqBE0J+lMKOhXLO/AJtE/jguH5YiqSJ7IBeQqlPqCHL1wn0VWOGSjUJ6gNuX56AGrc0WNDmDtj2pLMMTQi+fCFLVLetTMzf2qnOu9A19x1G/UuojehMXWICpS2XqfpEKKsVcxlvF0YYkWk=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961158515434.52762457646713;
Wed, 15 Jan 2025 09:12:38 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uo-0007S3-CS; Wed, 15 Jan 2025 12:10:50 -0500
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 <philmd@linaro.org>) id 1tY6um-0007RX-2X
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:48 -0500
Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uk-0006ab-E0
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:47 -0500
Received: by mail-wm1-x330.google.com with SMTP id
5b1f17b1804b1-436a39e4891so48817925e9.1
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:46 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38a8e37e36asm17745917f8f.5.2025.01.15.09.10.43
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961045; x=1737565845; 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=+rpS4UoGMNFWvPB8UZ1XtPkvHJUg2YKopwCuDHPyLwI=;
b=P6M+Zvz+hcU9nfpTr6Blmwce3ktOcXbQnX6+VdhCdAyf5zE0GwCPYCaRxJCB2UHuaq
4KOCR6CLtbag9NjFi0M/8Ss0gVke8Lm27xqEJ75MPmIMPug40UHgzyqK8Un0qr7as4K8
p63Hj2vIYifURDSDo+nlnp7ewQDsUf65Cee6o1R4z0MdI2RYVoMSx5uOXFQGsbhns3IG
kPRg8pyVg6eqxOaCCy/rcXAB98lyTEN9QQuxmsYCgJxBz4/FmlfyvmHmFNNKBZPbgHud
8+EYhdJjC8STjvKKZ4f2x5Z2jN6gi+isILTEQC8M3uiLBgCD1myfonL5tfIJZ4I4eICK
SqDA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961045; x=1737565845;
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=+rpS4UoGMNFWvPB8UZ1XtPkvHJUg2YKopwCuDHPyLwI=;
b=nDRwhxc2jSngPPHf4/HXSeIoF1L9wOawj3zP/XxthOIZOa78r4NIiOwJmP6MG0Z0D2
igacmbMXOl8euV0pO4THWw3DB2aaRvYtNeobB+6QbgSaXvyTaOnJdT+QpoBAt9OMaDqw
rdvx6Kdoadwqiq0BxV19iU93kjvJazMkw+y+uCAH/uPURDBTwgJ8hbVbuFSB4kqheRYp
PfwBqM/7JNin6CjKAicmV8dr6gCHkXJwWcyYwETw5YZGJ3+pgXBkCo+JU4lKiyqNYFmQ
kGfeuHJvbb4wuo9Su0LWMkpX9Ui/C7+PdqnU58XbfP45QX+ODo5Ilz63Wnpa2tbEPylr
2KGw==
X-Gm-Message-State: AOJu0Yzm7etfHHkphwdfW1mJZs55DzJmloEW/vHbDI3NhkQ2sQ7GzXhX
hXuQxAHb2k1DdI/PH7VzJ99rd/qgL5u9pX5E2bgoUTkteFdfhxTCy7wjcdGhtT9JJGkixx7zhJz
IAY4=
X-Gm-Gg: ASbGncua5SW6ouRRm6y2dleB1gbmgBjA6mOU2kk4D0wY7FFrlsqvcqdQePVvzh5YNOj
R/PfFmG0aRIytQ5CXCazQheS3yi5xfiKPrtRFTJkW4AS0HUtNRY28oqJZ7zgBInDy3SpDz8pbPw
EHbcuJ42VMA6AgaBF7wSikp2vB9IUPY76ra2qa2W2I9ogBUyPJGjeoh1n7hHdZ1CdZm4m4ztICk
nKr75+R/BUD2M5l1f5lm0qiV6q9L7UgDNeP+3LOtCJroLXfmdLsvLp0kh0Cn1nHDPL8XcMDPzDW
VsOxohMwxTihqRDFN+FaODsZvWnmxNm+ykFJ
X-Google-Smtp-Source:
AGHT+IGwIMmh5nVSPuxckx/5uYr/mS/yXYwsEBpL4JrB/ufEyTJQypWVkjFP/rKPOL87TxcbnDBPyA==
X-Received: by 2002:a05:600c:4f4e:b0:434:a902:97cd with SMTP id
5b1f17b1804b1-436e26935cbmr265279745e9.12.1736961044600;
Wed, 15 Jan 2025 09:10:44 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 07/13] hw/arm/virt: Remove
VirtMachineClass::claim_edge_triggered_timers field
Date: Wed, 15 Jan 2025 18:10:03 +0100
Message-ID: <20250115171009.19302-8-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::330;
envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961159615019000
The VirtMachineClass::claim_edge_triggered_timers field
was only used by virt-2.8 machine, which got removed.
Remove it and simplify fdt_add_timer_nodes() and build_gtdt().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt-acpi-build.c | 5 +----
hw/arm/virt.c | 5 -----
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 463ac09615e..9c531e28d04 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -118,7 +118,6 @@ typedef enum VirtGICType {
struct VirtMachineClass {
MachineClass parent;
bool no_tcg_its;
- bool claim_edge_triggered_timers;
bool smbios_old_sys_ver;
bool no_highmem_compact;
bool no_highmem_ecam;
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index ccecea9e09b..6e04fea165a 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -537,15 +537,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, Vi=
rtMachineState *vms)
static void
build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
- VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms);
/*
* Table 5-117 Flag Definitions
* set only "Timer interrupt Mode" and assume "Timer Interrupt
* polarity" bit as '0: Interrupt is Active high'
*/
- uint32_t irqflags =3D vmc->claim_edge_triggered_timers ?
- 1 : /* Interrupt is Edge triggered */
- 0; /* Interrupt is Level triggered */
+ const uint32_t irqflags =3D 0; /* Interrupt is Level triggered */
AcpiTable table =3D { .sig =3D "GTDT", .rev =3D 3, .oem_id =3D vms->oe=
m_id,
.oem_table_id =3D vms->oem_table_id };
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 4ec94190769..ec47ee4755a 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -361,14 +361,9 @@ static void fdt_add_timer_nodes(const VirtMachineState=
*vms)
* the correct information.
*/
ARMCPU *armcpu;
- VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms);
uint32_t irqflags =3D GIC_FDT_IRQ_FLAGS_LEVEL_HI;
MachineState *ms =3D MACHINE(vms);
=20
- if (vmc->claim_edge_triggered_timers) {
- irqflags =3D GIC_FDT_IRQ_FLAGS_EDGE_LO_HI;
- }
-
if (vms->gic_version =3D=3D VIRT_GIC_VERSION_2) {
irqflags =3D deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START,
GIC_FDT_IRQ_PPI_CPU_WIDTH,
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961071; cv=none;
d=zohomail.com; s=zohoarc;
b=LizpVrduns0zJang9dyaR/ln0u8pK/QUH9sc82lHkUIT3CE5A+Sad54OjnWml16oLBr2QoV+Ifbsad/53yj+Ky06mg8deTjWOD57N9yafURbKeH+NxeO6QeNUaDHFYlpzvu8VVT3u0Eea4zcPR3kYPlUkArl7yeJcX6QB6mbx3M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961071;
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=JVvcy2oYMKXeEI9v0ixIQcy6UbZyWQJwljg2mj08G8I=;
b=I3OD20pVSYS4R2tJs0PuEbJDpBHUSbYGdIlO6PetuoWRx4Rv24f2xL7KQYZK52wuPMiezivxL02cZMjnw/igHi5T2ILxFntYYoKk7lIwO4FCC01NKjDhSdeB9NuQnclRjbyGOaPgIshK1LX//fqvgpcjdmuIJGuUIrLUOv1lERo=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961071639805.3081875388895;
Wed, 15 Jan 2025 09:11:11 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6us-0007aw-Ns; Wed, 15 Jan 2025 12:10:54 -0500
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 <philmd@linaro.org>) id 1tY6ur-0007Z7-8L
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:53 -0500
Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6up-0006b4-F3
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:52 -0500
Received: by mail-wr1-x436.google.com with SMTP id
ffacd0b85a97d-385d7b4da2bso43712f8f.1
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:50 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38a8e3838a3sm18241435f8f.33.2025.01.15.09.10.48
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961049; x=1737565849; 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=JVvcy2oYMKXeEI9v0ixIQcy6UbZyWQJwljg2mj08G8I=;
b=wJlkU7EoKSw6oXWJLUL8URn2/z7ZAGuIVOHM5wLkXHB6mUjkqx4J7gPJNotp+WkfEG
J0k+peY2ZSJ//MqSwd2pKWsWpzyW62mGUvnsxKNBDKNMLmsUnek9OW1dPTHq2K5356xh
NqVQZUXCO2LydB1EwrFUBYJ4S7wlolncRcdYLjExebcnqhc1UM4nBbaPZS6JfXdTRLlQ
Br1P1RYEoqRBl6Hu40BjCq7YiaFXIcMASasT38/6A67CUtcTfYaZIWAi6WoQ/bbIbVqr
Xl754iYKEWbqmQznSplbtwRPXryQg90sJYWLZWp+Y9gYcf2SXPzAQh1Hkk15ijq8BlpL
3CiQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961049; x=1737565849;
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=JVvcy2oYMKXeEI9v0ixIQcy6UbZyWQJwljg2mj08G8I=;
b=Wral/XmkhOyJ4x10zZeOiIJQgqhHldlTnh3KipWvPQ6e3Z8xhfI0jC6UIi5+RfSK6K
wZvVeu5/7ah9DMhHwBnnFfJEbA3U4TAtJ+CmDIxkF7yDL8ND5vlA93ex6nhCWJJGyC+v
z4Az0KECKas14ADeHq4PK3D98qECpRTccPAk39E4tjnzhyJ6OkmfZqylJI0QoewJ2dwg
xf3t2vrcLnQsvR/LWouE97w4n8/imn5SWMcpl4FCVLXEDqEHPu7U8xE/kFUz9igdYwl6
m7m08pF6bIUHugqzGzSnutsTtWxZN60CnJnesXP0MKVefvdM5Ja9QcsGEKM+iHkGp+y6
b2mg==
X-Gm-Message-State: AOJu0Yx+qTWEzDv0PIbJ06f4OnERWTYm7CvXZWE0SwTbjLM99iF4+U3H
fQfn3/RH80wSvzdRFd9sR9T7Fpo69LO3WXPJOUgWAmhBym0B+SRmhBOFBC758pS3FD1VKZrwoiL
Zpzo=
X-Gm-Gg: ASbGncvbUcA2w5c74w5vFi79ZGnng8l+OMbLzv5Vi+hyGXw3mq/GWFxqDGLkuzeBubN
yexShLrfRfvirU42UfyKfWqd2b6/HuAoak/xizx2jOLnmjvShvXiSugsj285v9plXqBlbpJG2X0
CD8LTRxWiSLUshPznSmUOenTR1+yBy4W/8mX4U17R2EUXW/D2hbrA3i6e5djcCNt3zhcHmvAnqy
woambDxTD2Ozwv3X3BNrgicp8aFheTVTO8w+EuDZf67VGA3EuFbzDeGRI2G7C/BPen3LEr5zZn2
1jl3B51gGGMmtjmP82SO6OWGuvsdT7Qo8mvk
X-Google-Smtp-Source:
AGHT+IHI/aH1G3fBpzbOw6V3u4FJLC/zhX9XpPVyil0Nq1c9XpBjuRrEMMD+9jGCWMnrc8u2w9QsxQ==
X-Received: by 2002:a05:6000:18a4:b0:38a:9fdb:7307 with SMTP id
ffacd0b85a97d-38a9fdb750amr16887449f8f.43.1736961049233;
Wed, 15 Jan 2025 09:10:49 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 08/13] hw/arm/virt: Remove deprecated virt-2.9 machine
Date: Wed, 15 Jan 2025 18:10:04 +0100
Message-ID: <20250115171009.19302-9-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::436;
envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961073086019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 2 +-
hw/arm/virt.c | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index 732ec2cd05d..dbd04b00e4d 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,7 +1065,7 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` up to ``virt-2.8`` (removed in 10.0)
+Arm ``virt-2.6`` up to ``virt-2.9`` (removed in 10.0)
'''''''''''''''''''''''''''''''''''''''''''''''''''''
These versioned machines have been supported for a period of more than 6 y=
ears.
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ec47ee4755a..6ba75a91574 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3544,10 +3544,3 @@ static void virt_machine_2_10_options(MachineClass *=
mc)
mc->ignore_memory_transaction_failures =3D true;
}
DEFINE_VIRT_MACHINE(2, 10)
-
-static void virt_machine_2_9_options(MachineClass *mc)
-{
- virt_machine_2_10_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len);
-}
-DEFINE_VIRT_MACHINE(2, 9)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961140; cv=none;
d=zohomail.com; s=zohoarc;
b=HO4041DAya3G98AGxSX23N365opm5mDwn9+rPMVQ0ZYQDDOjgJsAWFsGZElwqPbV9FeR/MbSv/9c6xjN49mRwKbOAejKlMNOw+95C5IkeFvID7G6j61VRYWcJuL04xAoN6tD4isZTR6GprDFKJjj26BW/bwM23E+sETZRZuv/7I=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961140;
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=smDhBagDkZwA365xUOcNTdBn7TvA4+hGOXOJbXYQ2tU=;
b=hMSQSeMYkmqbkhj8yWHVscCfA5Jxy0IoSk596pbrUP9+SC88kBC122uIu6KDY7dgjvsMY0WSAQuE+l10zjBB2plPISHON58Phf5JPV0GPFDQKeI8rF/iR4hAy1QceGsKfXJlxu01s0fqUwVgY+B9d15IOR9K5EPATfn9NHM93KU=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961140468110.78331973660022;
Wed, 15 Jan 2025 09:12:20 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6uz-0007e0-2a; Wed, 15 Jan 2025 12:11:01 -0500
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 <philmd@linaro.org>) id 1tY6uw-0007d2-9M
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:59 -0500
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uu-0006bi-NT
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:10:58 -0500
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-436202dd7f6so79355525e9.0
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:10:56 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c7540ae7sm29418015e9.33.2025.01.15.09.10.52
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:54 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961054; x=1737565854; 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=smDhBagDkZwA365xUOcNTdBn7TvA4+hGOXOJbXYQ2tU=;
b=T6igV5rvFKBzv8pKAGeY5lfzwS0Sy6vpXAJhyWLrfulJdqDMEOIx47WW6TqQD8Cei9
7FYWtlJE8KY/JWm4KK2V9iw+P4auhMgRWhoVzb7ZHDsvxmCI5MHVaGdt27RLMIphw/bm
6NLkc4bXNfiZ4LFu9sVJckjHW+Pfi9sbet6wCE5R0T7fdGUNE035zgYOm9lZxN9bgkgx
aGnW2jTyc/NSFnF52xCRagZDe6yYlHWb4SBuW1lRnj2Vuh5Bdx+CCixZ2ZG+YqgWIiih
DWcqZ38DauFyCUJIAG/QEm3r4dFP4kMdD78QylqR58VcgPLyrOPX7rn9vnQdtzGWuQRi
/JlA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961054; x=1737565854;
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=smDhBagDkZwA365xUOcNTdBn7TvA4+hGOXOJbXYQ2tU=;
b=ltZ6nw5/069HsYMnCRfKlS1V3D53J7Fg2GMx0K1xh3zJyP1rFjQ6VTWm7XdkGW4ZX1
NWAxX/heHznU51Q22VyRcKVCyYxj+N+q7GxgLgIDjWG7yo4tQZldfSksftWHdHH0XJhS
Yijpa075x0CnUX+sfXT02gDMc5dy5zQFeMXNPIhaij4Mq6wUlBnyF386hGViolhI8XJ1
CF/zRbTs55IRbeSZNMwUVqZi4X4fYacIX4Iy33fxUnRcmIa/Ael5UShLH4oYeajMghSK
flMfUzzgtpHzRgoGs62yfvMIZudsfifCAPaWJNjRqNACgBcqzxDlEyhsEGZSdy2+kPhR
6C+Q==
X-Gm-Message-State: AOJu0YzT7+jFW2RYrbHDCNKy6LuCoItbTI8mwxdalH1noXRK+FLmViZS
P0v3NZ58sL5tDTOGRtMZKUmYLl+X4Gz6N0exeff9wvRy8uaWry3ogReyo7JCz/nnknW8p/stYOF
fitI=
X-Gm-Gg: ASbGncvMYhkKlfaLzvkJJ+4oP82cePnMy9uf5Mu6RJk+1dOVRvhsgvCSAiGrVgZkoHG
8DqXt0Fi/QLCZKT4ciJTFJgkBOeUpxYMFH0+R24tUJS48gTCsaC48QuTFPrP7Hqa6yAQWVAK6ss
CbE7oKFpgLxcphAfv2NNpugxfXoVxd16iNS2DTnYqf9ikV8fzULFO4p4KmQpqtwpVdL1qPp2hnG
h4opl3ob1Fri7+z4T3oovhncjBXM+A5bX4kyFowdzfWZW5GqERQqig0og16ZlE9PukQgq7SdzT6
3A2vtXNKX7mbKIWna2GJ3IcoW62zdxlrRwt4
X-Google-Smtp-Source:
AGHT+IF4Q/LJ8BeUjR9FiMWcNxihwi+xEDhNoq4229BpUXqc778f60G2Qndphf5C4VII7rl0A+BIYA==
X-Received: by 2002:a05:600c:4751:b0:435:23c:e23e with SMTP id
5b1f17b1804b1-436e26af4b4mr290255365e9.12.1736961054538;
Wed, 15 Jan 2025 09:10:54 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 09/13] hw/arm/virt: Remove deprecated virt-2.10 machine
Date: Wed, 15 Jan 2025 18:10:05 +0100
Message-ID: <20250115171009.19302-10-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32c;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961141585019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 4 ++--
hw/arm/virt.c | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index dbd04b00e4d..7c8b98fcdf9 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,8 +1065,8 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` up to ``virt-2.9`` (removed in 10.0)
-'''''''''''''''''''''''''''''''''''''''''''''''''''''
+Arm ``virt-2.6`` up to ``virt-2.10`` (removed in 10.0)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''
These versioned machines have been supported for a period of more than 6 y=
ears.
=20
linux-user mode CPUs
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 6ba75a91574..dd44fb30773 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3535,12 +3535,3 @@ static void virt_machine_2_11_options(MachineClass *=
mc)
vmc->smbios_old_sys_ver =3D true;
}
DEFINE_VIRT_MACHINE(2, 11)
-
-static void virt_machine_2_10_options(MachineClass *mc)
-{
- virt_machine_2_11_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len);
- /* before 2.11 we never faulted accesses to bad addresses */
- mc->ignore_memory_transaction_failures =3D true;
-}
-DEFINE_VIRT_MACHINE(2, 10)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961102; cv=none;
d=zohomail.com; s=zohoarc;
b=BF68e3ElUVcnwo5KAXi3VbzZgNF3kwN/YATXF5C4xww/yYgmt4ZPPlbOlQQHMjRZpVj5G1eQIWBb/gE1axIZ5xrybANHqzvcD6XqwrvlOcnsFJwr01gElSlDcnWVaNoOYbnKFmNEo1EIhwrl34uel86bR6hyOdFFcmpofdl0jcc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961102;
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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=;
b=aAlk8PVZBgMRKTzQXTOtdLEL3OA+v+ExpjVpSCDuj2CxAoxonWWU3mRqUjUSAautEqTGKkX/f8/xAliCg/PQDzoSD1OM2kvXFNBFSjvKsq/4j7ahvIFgMzp1ZhYVFui+KeZ6oj513marvh2ACRze+ue/wgMnLaO8yVE25bJhR80=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961102641838.2798967678798;
Wed, 15 Jan 2025 09:11:42 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6v3-0007i1-V3; Wed, 15 Jan 2025 12:11:05 -0500
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 <philmd@linaro.org>) id 1tY6v1-0007g1-IT
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:03 -0500
Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6uz-0006cC-AU
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:02 -0500
Received: by mail-wm1-x329.google.com with SMTP id
5b1f17b1804b1-436249df846so48733355e9.3
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:11:00 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-38a8e38378csm18013507f8f.25.2025.01.15.09.10.58
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:10:58 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961059; x=1737565859; 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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=;
b=a5/FHipK8O54Bj6AOVKjPw3K82sa2M7k1XFu8KzD29RzpWnFMXHmTf8eA3/7Jkp1xu
xMPlJBN01V2GTr8tp6BayAMZvKJtSW58hZUR6fbKkZnpyMSN5Z+2Xo8QBAW2jiQQgOdp
bPIylf5LYOA/2p7NqDwdhfupxTf2/XeklfT0wiYZx782FDByZasOyXaaHrcizVmdUAjr
lZSJJfu+wk8cGGT/QAS72l+1sIiAZuwChrcPB5kvvsRGlKIIfUGxdVlBCATsdXmCkrfO
Uqu6Ka/KEPengw5uDxS5+dOZzNDkxfIOJDq/d0KIbPtxrPW1O6bELof7NlkDKAfag7pK
Wp4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961059; x=1737565859;
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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=;
b=bdzcNBL2ZKHnQy1bAEEEm9/rzMSsyaFV4cCB+hyVNpb73zKNR3o/eb8XZorIiIfpJ3
pAwqXJc/nmWg9MaFOzrXKy7BGCS3P2ZJUu3aDS5rXEwXW5FvdBu3kZlAHSiBQFOYyb5t
lNqYXnlSp1d7FM7IH97F8z/LpJ0GeDJpMHPWf0E6OmymjQZCsDwCBwdmdYFj3WPzfwP0
8w/abdCvpFBOBVdwh4zFuIoqIuOdu4isYjufsJovS7hiI5XgYvDqnwbjTWIepzZYUqPg
7trX4JFZJygwR7UfBu3jPT1h5UmuXGzimTLp1SiSiTQliLsRVRfhAgR8uZ2fxWB4SPP6
uNdw==
X-Gm-Message-State: AOJu0YyBc5cqHBkJH7myTME9G0qfa+RnaqiW0R9SzC0fGJrMOG1hUjHn
dUKYF3Qo8BZnX26twmEtfO82v3SZ5L6ltqcuOLOFaKKr+3dASRchYifutrlCjkGrbxlzR1YQdNV
kQ1o=
X-Gm-Gg: ASbGncuNqEoAGBZw4zXZHW+6fA8UGIyQYrI14olJ/FVwQx9FkDKvBi2vA1g8khlDYJR
UTcow/i5miyKjTQPkYB39bj3KhlhcCd7LTkP1welLhlf+HWS+THu4an+s5eGhaRsTR08OoL/TqX
JF6yGoZOMGiVWjHgWf9/gnQ062mwXBQPIBM+942sNqFmPEo1mQf+4Rkm2Tt1wIMkWIoRTDEjLXo
h9h92gRUds2oxOhqHtpIrHmo6jQD0ktScdCQsYl9xERmoLJtC32jC4fSCZH7A6eT/WWOSquFeeB
Vs70mj3YWOG7szYcuLANlPuWFT60bwnul2D7
X-Google-Smtp-Source:
AGHT+IHJrWnvKPdYAfwwnHpmgsmZmbkxttCkVE/mIaNFSHzt0Z9vLxCr93Y7K2oDzGKeMXEg7aLFCw==
X-Received: by 2002:a05:6000:1f85:b0:386:4a0c:fe17 with SMTP id
ffacd0b85a97d-38a872e9105mr26380872f8f.27.1736961059142;
Wed, 15 Jan 2025 09:10:59 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 10/13] hw/arm/virt: Remove deprecated virt-2.11 machine
Date: Wed, 15 Jan 2025 18:10:06 +0100
Message-ID: <20250115171009.19302-11-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::329;
envelope-from=philmd@linaro.org; helo=mail-wm1-x329.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961103224019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 2 +-
hw/arm/virt.c | 10 ----------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index 7c8b98fcdf9..0594bbd4363 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,7 +1065,7 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` up to ``virt-2.10`` (removed in 10.0)
+Arm ``virt-2.6`` up to ``virt-2.11`` (removed in 10.0)
''''''''''''''''''''''''''''''''''''''''''''''''''''''
These versioned machines have been supported for a period of more than 6 y=
ears.
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index dd44fb30773..ae331df9349 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3525,13 +3525,3 @@ static void virt_machine_2_12_options(MachineClass *=
mc)
mc->max_cpus =3D 255;
}
DEFINE_VIRT_MACHINE(2, 12)
-
-static void virt_machine_2_11_options(MachineClass *mc)
-{
- VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
- virt_machine_2_12_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len);
- vmc->smbios_old_sys_ver =3D true;
-}
-DEFINE_VIRT_MACHINE(2, 11)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961174; cv=none;
d=zohomail.com; s=zohoarc;
b=d7+sWzzMAOwz6rXimmwBre4CNsqvPKCJq/qGJv5iLFpTlKs2vZRlguYgQNACQzX65O+y7lYl1xwQIDxbBoFqbnwhdA125VxCW1Y65PrlxYnOMAtB+vZe8B6Nyh6YtX1P8kRDZ4D3+6pbm6EMtd45rL8JrrkANmiKMPkRmeR6Z54=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961174;
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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=;
b=Sv7MYZrlLYupXSdfSTUyH1H7eXGbpRp3Yw3S3vWgLMdFNphUBmLtJxmetHAgNrltLQntLp0VFdooVdpMbhCPQoP2lzgWIBhpnFZ5tJx45XcwBjXetdzd4TkPsKg6cRgOxPeZcY/lS/eF5NFIAoFovnb6KBrnrpNMbHbvX27RfXI=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961174153765.1061358157666;
Wed, 15 Jan 2025 09:12:54 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6v8-0007oa-Aw; Wed, 15 Jan 2025 12:11:10 -0500
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 <philmd@linaro.org>) id 1tY6v5-0007lz-VD
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:07 -0500
Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6v3-0006ci-KB
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:07 -0500
Received: by mail-wm1-x333.google.com with SMTP id
5b1f17b1804b1-4364a37a1d7so71884635e9.3
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:11:05 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c74f9ccasm29530045e9.39.2025.01.15.09.11.02
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:11:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961064; x=1737565864; 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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=;
b=HctiuCNckYM0/rmBwP5kYRJydkDSY8Db61NzhG0iebv4PUzmcyk2YooA+wHsf3K/Y4
WrIxHQ6BCddHYimGq/pZGXTw7WfGpQSj3ef4/VxiC3NaygKmfS0m8dfxPXz3qKkeJweM
1f4aWOqpZm3qfSs6sU2cn0FjVz4Zcdacvj3Y+hoa5Hvr3EPsa/xpFIOSMhrbfJZE0V4N
AxtUHR8sN3AIp4d9lS5Z8m329fD0dJcbJUxJHejcOYFxaUsR1UWIVlaQk4zVxkqPfneL
pQ746uNSxDqXGsebIdQESo06rkuZvlDi4csvbkzHbMTpVw+3VsikNxYY3NHLp/0p2o83
57GQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961064; x=1737565864;
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=Pa1qCoN+HFadRplHhWS5olMOGiE0VGbusTWsCAk4+KA=;
b=MmWUm5qGjcUzT4b/H6EPx1pUSPHF3b3lxmG82K6Q5XLbMdSBPqKjkIrSjUx94imLaj
xgsEn2bbw/rBY0IGAtxvSchXWCme1NJUH0uMnsF7z6uBl17kY6nA1DYxmRHkI3umKHe7
EXDFykUTa4wrFrDwy2BWT9j7w08zT6G8C9MP6zOjjL5Z78FDka0epwN6qNhrVnzyOzOr
G3sEkTU/AFUB9Uh/eVb+FexllYh5sorR4HBnzuefOkbswGcBXQeTRYR8ANko0sbw6FlW
mubJpKN97IXlq7lPufbfxpyFCQASs2pkvSLbZ3/3Cxb3ZCoAkkOrBybioatE4wsjn0dY
cNpQ==
X-Gm-Message-State: AOJu0Ywk+wuxuZ6hZ+oxfiRTuSQM4JvDQ53vXisWkyNphn7p0anWHCmg
d+nXA+clw1oMGU/ky/WAIfh0XALx9FKYMEqoET60l9Dg2SgEyPPLoJYcCfBwfyGO8dm8Q7JPa1n
yOd4=
X-Gm-Gg: ASbGnctiJK/nLzz+8VY7V5wwXfsKIqiU3WTxgj5baFCOYfhlDw6z5mlmqkLq19uefAa
+75TIV58tUFVxWqy7Z0KneUVuX81DUVU9iaHAGTje6Q/OUHw6b/qBMcGrEKPo2zfHOSQ470bzoo
qEetGO1ctelcUuhqLL2povDVYVeKk5rVUZNBtQCRHsgVzJwsVVGBXLxMgo67uunAtYNBlC0o/d1
tkJAGUihZFursuQzptLZrq6vDoHWNj8IF6DMCgZv+o79Prct/GD+5dwe0NymVNdEkrWHV38+Yun
eaZWcts7Rsa6rJU+qBkEANQZOZL8K+NIWwAj
X-Google-Smtp-Source:
AGHT+IF3giBnmvgmdm9NPZ5PYYTESIR2khg8IQrYyCoPVH9dVMyJd+oLeKLgX93aeb5GfVSK1LOohg==
X-Received: by 2002:a05:600c:4704:b0:436:469f:2210 with SMTP id
5b1f17b1804b1-436e267f796mr222655705e9.1.1736961063756;
Wed, 15 Jan 2025 09:11:03 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 11/13] hw/arm/virt: Remove
VirtMachineClass::smbios_old_sys_ver field
Date: Wed, 15 Jan 2025 18:10:07 +0100
Message-ID: <20250115171009.19302-12-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::333;
envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961175730019000
The VirtMachineClass::smbios_old_sys_ver field was
only used by virt-2.11 machine, which got removed.
Remove it and simplify virt_build_smbios().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 9c531e28d04..b2cc012a402 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -118,7 +118,6 @@ typedef enum VirtGICType {
struct VirtMachineClass {
MachineClass parent;
bool no_tcg_its;
- bool smbios_old_sys_ver;
bool no_highmem_compact;
bool no_highmem_ecam;
bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ae331df9349..08117b396a6 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1688,7 +1688,6 @@ static void virt_build_smbios(VirtMachineState *vms)
{
MachineClass *mc =3D MACHINE_GET_CLASS(vms);
MachineState *ms =3D MACHINE(vms);
- VirtMachineClass *vmc =3D VIRT_MACHINE_GET_CLASS(vms);
uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len;
struct smbios_phys_mem_area mem_array;
@@ -1698,8 +1697,7 @@ static void virt_build_smbios(VirtMachineState *vms)
product =3D "KVM Virtual Machine";
}
=20
- smbios_set_defaults("QEMU", product,
- vmc->smbios_old_sys_ver ? "1.0" : mc->name);
+ smbios_set_defaults("QEMU", product, mc->name);
=20
/* build the array of physical mem area from base_memmap */
mem_array.address =3D vms->memmap[VIRT_MEM].base;
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961141; cv=none;
d=zohomail.com; s=zohoarc;
b=Y15UHibz5csWHlRq8j4GnKfO2hOJCDdzCvSeGqpy+lYQJ3y3uFRWkqg5N9vrDiFfUaLW8Hh7nHjd7Jyo6UTIHv6WMUcPcLSbIHO6dsdAVaTpgv1bvax0Mu6ob1dQZwLE9oLM2i50aFceEncpSdvwWFRFDwy7RBn2g83EQWiInAU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961141;
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=yWo77aykn0azdzOtkEKhvI1Uh0zOSmfZ8twQPYS0aJk=;
b=YGJAxN3R6xSD6u2ksw1pDP2sNtKveNdMOsMiGKC1dRW6rzh8MZkHIkl2qJbuhz2UpyxVOXPQFGbNjfCzHtAMYg+wJuHvd6jhGjI38L9oWrpCEm6hqBEOUmjtatc/qB4Haqv6tUNy0IIsuWY8w+tjCw7XbKw7ELydRDysFRh8AcA=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961141304152.61153892927757;
Wed, 15 Jan 2025 09:12:21 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6vG-000840-PU; Wed, 15 Jan 2025 12:11:18 -0500
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 <philmd@linaro.org>) id 1tY6vA-0007v5-Lq
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:12 -0500
Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6v8-0006dM-BE
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:12 -0500
Received: by mail-wr1-x434.google.com with SMTP id
ffacd0b85a97d-385ddcfc97bso37092f8f.1
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:11:09 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c7527fd1sm30048215e9.31.2025.01.15.09.11.07
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:11:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961068; x=1737565868; 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=yWo77aykn0azdzOtkEKhvI1Uh0zOSmfZ8twQPYS0aJk=;
b=VFRtnxc+vPd1OTid85ro9u3kvuXpI+jMNR2SwpnQDHF2Z9pGZ5TZIze6bN6YUglwqx
dY9WF8sKtkPX8I+sWBWGON0aXLoIfzaExQa/oMfBgiyBL1gFceTQhDyXfklMDJbkvWJI
jACbGc/3M5n9jisXu0X+9IAJk+NyB/P6ZsKEHjv9Ast03V04CBkwi2+HNeav7vr+A5Xm
kCsdGDvccLbZEyaZTZHeAQh5RwisX86gT0HiNtPeJGbvNxcYmPCm3LJsIIwEFLv8IMoh
HxFe/gc7XQK4XseBBCaukwkOTq+TgweYWR6av36ZtldsPiGTouIyt9ftB7/9Q/yybynw
9+3Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961068; x=1737565868;
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=yWo77aykn0azdzOtkEKhvI1Uh0zOSmfZ8twQPYS0aJk=;
b=qn7vrLE8D8aJUw4P1aodNFGcgxrpF6KeO6z4989sSVi+AygPAI1Z+fGsensZnP4sCw
NPSsPYstEfsSvO4cezlwkIJlkqwk/hG7c9DJi4/GLSs4et9AtYdSlTQw470cxJF3VlPy
ewJrOoZo939XY3YzrItQrvcxQLvqpp2WMua02DfCONe4WZUaNd//DjVOzjutvgIvDnwj
3gZn1ahhMSdBE4JOaiyWPEEl7inCZdqVRJZQ8DGj4IERh0q4chmbRwU+c0MpIM93rx5x
G1/pLLBTEseU5yQvwJ5Y1F1/QO5jr63HLBX0vuBB8zlqUtc4LnlOaBVq1jzSi7iwOlqA
UXxA==
X-Gm-Message-State: AOJu0YyqXzAFf6hvn/6I5VR/IN1VGX2Qn5MsFmT7KC8CXX0DEvzO067g
bwaeHKVPEycpbGbk9XjvsI0LOKB9PJ60fT21Veqz8yr6LBgK14EjpLn+DBrSTxcgsSZG3ZW0w10
+h04=
X-Gm-Gg: ASbGncsgvtELTQA7CjfC+pQCI7UL5paapxSW7GxDt8IKvqpMu6RyzZrjRjrzTCR64HD
90GHhDSOib2sk8Gvkgxvrrwi8UmBcnnu3+5SUtOU1JNjoubeO+gcwLuohtwRKQCNcoGMgu5kcMh
LxFnkrTgbY+Hhkuj8iaBnty7TTDVGEqZlrD0iXGW9rw4sVigwVTlB5YAX5SFHPS66xhBhVcsYY2
A436WyuUvg8bv/Gjg3ms4xCXXBC7qpBOKG7ZUDSUo2jSSq/tMWAu2vIoGnTeh1wY+JgSjOM+fjg
1LarehYlTKmqjkNsN+iQhW8yojRtHcuN+7qL
X-Google-Smtp-Source:
AGHT+IEByJXVgKrJbPCPYTA/lVh3xaA5xEtb6KN2ZM7ZMsyU/96Ownea/OF6jdGBPrGrg7XIiO7RhQ==
X-Received: by 2002:a05:6000:460b:b0:385:dffb:4d56 with SMTP id
ffacd0b85a97d-38a87317e45mr25546703f8f.53.1736961068358;
Wed, 15 Jan 2025 09:11:08 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 12/13] hw/arm/virt: Remove deprecated virt-2.12 machine
Date: Wed, 15 Jan 2025 18:10:08 +0100
Message-ID: <20250115171009.19302-13-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::434;
envelope-from=philmd@linaro.org; helo=mail-wr1-x434.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961143453019000
This machines has been supported for a period of more than 6 years.
According to our versioned machine support policy (see commit
ce80c4fa6ff "docs: document special exception for machine type
deprecation & removal") it can now be removed.
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
---
docs/about/removed-features.rst | 2 +-
hw/arm/virt.c | 11 -----------
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.=
rst
index 0594bbd4363..c915b2cbd41 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1065,7 +1065,7 @@ for all machine types using the PXA2xx and OMAP2 SoCs=
. We are also
dropping the ``cheetah`` OMAP1 board, because we don't have any
test images for it and don't know of anybody who does.
=20
-Arm ``virt-2.6`` up to ``virt-2.11`` (removed in 10.0)
+Arm ``virt-2.6`` up to ``virt-2.12`` (removed in 10.0)
''''''''''''''''''''''''''''''''''''''''''''''''''''''
These versioned machines have been supported for a period of more than 6 y=
ears.
=20
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 08117b396a6..a607a66a198 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3512,14 +3512,3 @@ static void virt_machine_3_0_options(MachineClass *m=
c)
compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len);
}
DEFINE_VIRT_MACHINE(3, 0)
-
-static void virt_machine_2_12_options(MachineClass *mc)
-{
- VirtMachineClass *vmc =3D VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
-
- virt_machine_3_0_options(mc);
- compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len);
- vmc->no_highmem_ecam =3D true;
- mc->max_cpus =3D 255;
-}
-DEFINE_VIRT_MACHINE(2, 12)
--=20
2.47.1
From nobody Fri May 9 19:15:28 2025
Delivered-To: importer@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+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1736961178; cv=none;
d=zohomail.com; s=zohoarc;
b=DdOjq3pvjKBLWcC6Dys4Yuxd1MnsWzu+5bJUajNygBgtbnVyqLViukbaTw2bYSwpxsg4IiIWD0OkdEIXvbfZFB/CfW2g3uz0abI/3on8qG6LGlW24HmhRytI0pitcbm4yuqmX3dWl806Tq6BqlVFIlsYIJu3rUGD3vZeBRq3GyY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1736961178;
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=kOweRygtApOATxyfDtRFWpTcMZz+FkF5/nAzWV1Nj4A=;
b=VNyW9KlWQdKq+01bGYjWDZ1kuELk6J8agFeDDVf7rZ8HVhXYcViuKTQwECL76dtUhPls4LtPBlbrBPCmlBsmlDu2aKDcq2hIaBxaKhuhKj7ijBZDdNeNEi6qmziQIrvtUYk+fLuIgzoXU2/Ezu7UHNd7Ipk/0PY0bmidysCzn4g=
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+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<philmd@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1736961178145553.651573630854;
Wed, 15 Jan 2025 09:12:58 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tY6vH-0008BH-Vq; Wed, 15 Jan 2025 12:11:20 -0500
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 <philmd@linaro.org>) id 1tY6vE-0007xb-5t
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:16 -0500
Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <philmd@linaro.org>) id 1tY6vC-0006eH-OQ
for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:15 -0500
Received: by mail-wm1-x32d.google.com with SMTP id
5b1f17b1804b1-436345cc17bso50455725e9.0
for <qemu-devel@nongnu.org>; Wed, 15 Jan 2025 09:11:14 -0800 (PST)
Received: from localhost.localdomain (88-187-86-199.subs.proxad.net.
[88.187.86.199]) by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-437c7499502sm30038845e9.4.2025.01.15.09.11.12
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 15 Jan 2025 09:11:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1736961073; x=1737565873; 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=kOweRygtApOATxyfDtRFWpTcMZz+FkF5/nAzWV1Nj4A=;
b=Al01Wlt8FmYtUEcZiX9EUSzXmO0AibwOPydsLTxq10135Zu5iquGBA0cvYcH/fcZB2
/vwFiqM+2h7kcQI22GOBIIoumXECjoVSLdnewW14JT7JrP/59B4WGpCfmhzppGlLrlz1
AxsGTsdXZffgFirM56fjQvgzCZNLcC2haOtQfh90BVpzE7OFHwnHzomyZ5sTmjSuOb0X
+qy9J1kcEfRdg1M/2/j1bCPoP8lkqvph+b3Pm8GnPgUXmpDZs1fvk10RFHzcEwRZZ/s8
tDxd8sfJt/WKwKnt9NyntgF8aFl8uKbDhLcIuI8MsqrRIX+XOt10QAlG+U4cbSNfOtfo
vDHg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1736961073; x=1737565873;
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=kOweRygtApOATxyfDtRFWpTcMZz+FkF5/nAzWV1Nj4A=;
b=ME16nb+2EKRE+ADhqzoFZP1aZNscGZtfBE7w4ZO4EAOP9LAh1DWBdS+8JaKp/NkjOP
IhlGSwUAJF1H48BwLvWTkqXVho4FN0FNpfHGQs8Dorg0smKqneLi4WKBZN6itLe/HTb2
6sRiLX75Tj0ZDRqE2acrJMVcUPtx8eJa1zwmQoE455uyA17pzbC5LnlDOH2bQLvAv3cH
2tVeEzUD9wwkyrT0lH9+CuWzFWyEF8cuNqBJMrfkYki2P8QlEERPdMLd8H1V6h4vb+mZ
0xKuFmi0uSOlsg60ZnHTWBpvFhoWESVsvx49E/KTMEBaFFSGDdpYXA+PEZOR1fmiYFki
8Fiw==
X-Gm-Message-State: AOJu0YyYUicKbahHvwfZhoQ5/aNbgxaLt1n+yGd4mAA7LuYhIBSBDUeb
yojQsOXyDK8vEfrAAo6aHbrx/aH/H/DjzC5hpqk6cumncyIEfSNXGjpmJqLW0irs6ubHpuXYFIZ
u2HU=
X-Gm-Gg: ASbGncsRzIY1Lkd1hERT8Js4RC0YBJH7k7NII/hTNJAMP+1AAtqXtn6ugf1QlD92fp9
GHGwDonMH3u2MglAUgEb+IJD1ZrsKAWNRNut2IgvT52M2jR41MA4BMh9pNbWKk7K8sXo3+f/6BN
Ei5k8WPwfm4R3ubadM3x1xJhfa8565/Pn5Wp0SO6xIPpH1W+SjwzsLWvjTH/L/8hOG1Q2DvnjNA
mgEsOU80IF1yVbOUVxNHTyCVMCoGfqx+q881LhFVQdPipNv/gEp8/fbN3lSK4oCWTyDhI8LVjOP
pgFDrOtS3Wc9Cqo4pe5TmDJXoe87eUp9X3QN
X-Google-Smtp-Source:
AGHT+IHygtNrtl0yKo3HXkXcDAd+L/glqB1lS78FqEMnUXMC0epOBXRkJcYcQDtP6B8DJUkT4H0p4w==
X-Received: by 2002:a05:600c:3543:b0:434:f767:68ea with SMTP id
5b1f17b1804b1-436e2677c7dmr305800585e9.5.1736961073027;
Wed, 15 Jan 2025 09:11:13 -0800 (PST)
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: Ani Sinha <anisinha@redhat.com>, Igor Mammedov <imammedo@redhat.com>,
Thomas Huth <thuth@redhat.com>, Peter Maydell <peter.maydell@linaro.org>,
Andrew Jones <ajones@ventanamicro.com>, qemu-arm@nongnu.org,
Shannon Zhao <shannon.zhaosl@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>
Subject: [PATCH 13/13] hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam
field
Date: Wed, 15 Jan 2025 18:10:09 +0100
Message-ID: <20250115171009.19302-14-philmd@linaro.org>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250115171009.19302-1-philmd@linaro.org>
References: <20250115171009.19302-1-philmd@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
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+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::32d;
envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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=unavailable autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1736961179741019000
The VirtMachineClass::no_highmem_ecam field was only
used by virt-2.12 machine, which got removed. Remove it
and simplify virt_instance_init().
Signed-off-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index b2cc012a402..9a1b0f53d21 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -119,7 +119,6 @@ struct VirtMachineClass {
MachineClass parent;
bool no_tcg_its;
bool no_highmem_compact;
- bool no_highmem_ecam;
bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */
bool kvm_no_adjvtime;
bool no_kvm_steal_time;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a607a66a198..4de5ce3c541 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3267,7 +3267,7 @@ static void virt_instance_init(Object *obj)
vms->highmem_compact =3D !vmc->no_highmem_compact;
vms->gic_version =3D VIRT_GIC_VERSION_NOSEL;
=20
- vms->highmem_ecam =3D !vmc->no_highmem_ecam;
+ vms->highmem_ecam =3D true;
vms->highmem_mmio =3D true;
vms->highmem_redists =3D true;
=20
--=20
2.47.1