From nobody Sat May 10 15:40:31 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=1610120474; cv=none;
d=zohomail.com; s=zohoarc;
b=SfAK8DK5TC7hrSMBnq1YMRhzroBcEmZQOndHsGI7dw1SesfYpXCvtgpsMyhLCmo4Y6duve49LBhqqFWIXgKS4oQqaqy9WBTzOm05mrf2+Mu4snWTlgY5697rbww8szAv12j9ZNeiXS1S/ADKn9VajnyOS16+jB5P2g6ljBBUt+4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1610120474;
h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=yZOeSSXeiw2HQ+tvPkDoDlq1tyApzywP9jbeOOtyMI0=;
b=RKiX3EGyekRe5p+TE/i+Zx7GYD9vn9Je233h1r2MsXJZ5G3jIeIF5wZkXIeW7pF0yV/VUo1L7FqYbkybtuBiMcsCSFW4n8dVps+rDb3zVgzdpeihTcDAFe2uZNycJBdFQqG+CXF8FSwwOARgsHbY+7ZMQwSrgz1xxDjF+M45jZs=
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=<peter.maydell@linaro.org> (p=none dis=none)
header.from=<peter.maydell@linaro.org>
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 1610120474231955.558864342355;
Fri, 8 Jan 2021 07:41:14 -0800 (PST)
Received: from localhost ([::1]:36672 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1kxtt2-00014t-UL
for importer@patchew.org; Fri, 08 Jan 2021 10:41:13 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:47288)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1kxtod-0004kJ-QE
for qemu-devel@nongnu.org; Fri, 08 Jan 2021 10:36:39 -0500
Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44228)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
id 1kxtoc-0002u1-1R
for qemu-devel@nongnu.org; Fri, 08 Jan 2021 10:36:39 -0500
Received: by mail-wr1-x42c.google.com with SMTP id w5so9381535wrm.11
for <qemu-devel@nongnu.org>; Fri, 08 Jan 2021 07:36:37 -0800 (PST)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
by smtp.gmail.com with ESMTPSA id f9sm15887572wrw.81.2021.01.08.07.36.35
for <qemu-devel@nongnu.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 08 Jan 2021 07:36:35 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:subject:date:message-id:in-reply-to:references:mime-version
:content-transfer-encoding;
bh=yZOeSSXeiw2HQ+tvPkDoDlq1tyApzywP9jbeOOtyMI0=;
b=WKIDaCNnP7V/SHcJyVnvTZn4dgMwMMlxZc+FFgYDG/TS3bk/0crVmWj03xQCWQZPD2
QHTTGneyigrBU94hXwQSzXsBrfGvPis2WPBtsDQLyqamFfYJ2rFu7HYsSj4U7KegHB//
MehRPHZHtXRGThCZbelzWkbLySidLJsrlkNJLE9rzq/V+dSCA07p3z+N7AhjMxX2xyYy
KXIRUIt3QK+ZxyQNXta8KeX2fyW6l2xxVGWGOGFW2QAzdna97+S9/VbMW5a3/37bMtbo
ZJBiitJoWs1bm1Xk4M+KYCKGG19Wp10ce6A5Ijr4uwqT3Rka7M5JyvWXXXgwsz+bsgQY
kZCg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=yZOeSSXeiw2HQ+tvPkDoDlq1tyApzywP9jbeOOtyMI0=;
b=KdawVwxhKV7GBvR15lzJ89uEDmw4qsI6gq4dG9vp/zz0iQhSAYZ3MY1WbKY4c/KOHd
/HM8gfmHc9DsFzJ1QR0KiRSAwMnPq+B2T+phNdAxLScbbzeQGBFJTzFXvDypDO4+U2ZJ
YFSvObAdpVouJGx7vBBOBsIoNClz6f9h0XK3Kq6c795+3QxITlbiBWskevlm542HH7bx
Ka7rXBzvovIskbE8SfDKL5jSaUzXIHTG17LJYJhI9aplJaLxmicchCoCmXy/Ec1tRImL
kJU+KTnLphzEpjanT/sMaujW3dfsG+xx9/ad51uK8ZhIf6YOGCs2lU2l63D5LTjQLjqL
Vvzg==
X-Gm-Message-State: AOAM531VfAkiwY0Wnf6ZiCQOiUvJxIL4S8r4n+KEpG7d2JemkBQOobis
hGarIbhNmkX/lKvCIhfhfO1MaA1Gd4iwEg==
X-Google-Smtp-Source:
ABdhPJw2MxbuHFOEN9pWVIKQZjkCEuqCxNN7x6GoMxno9fTrPIcaPE2beqsloQaR+qVCE00deUvlug==
X-Received: by 2002:a5d:5112:: with SMTP id s18mr4175743wrt.267.1610120196521;
Fri, 08 Jan 2021 07:36:36 -0800 (PST)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 08/23] hw/arm/highbank: Drop dead KVM support code
Date: Fri, 8 Jan 2021 15:36:06 +0000
Message-Id: <20210108153621.3868-9-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210108153621.3868-1-peter.maydell@linaro.org>
References: <20210108153621.3868-1-peter.maydell@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::42c;
envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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.23
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" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)
Support for running KVM on 32-bit Arm hosts was removed in commit
82bf7ae84ce739e. You can still run a 32-bit guest on a 64-bit Arm
host CPU, but because Arm KVM requires the host and guest CPU types
to match, it is not possible to run a guest that requires a Cortex-A9
or Cortex-A15 CPU there. That means that the code in the
highbank/midway board models to support KVM is no longer used, and we
can delete it.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 20201215144215.28482-1-peter.maydell@linaro.org
---
hw/arm/highbank.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index bf7b8f4c648..bf886268c57 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -26,7 +26,6 @@
#include "hw/arm/boot.h"
#include "hw/loader.h"
#include "net/net.h"
-#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
@@ -38,6 +37,7 @@
#include "hw/cpu/a15mpcore.h"
#include "qemu/log.h"
#include "qom/object.h"
+#include "cpu.h"
=20
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
@@ -396,15 +396,9 @@ static void calxeda_init(MachineState *machine, enum c=
xmachines machine_id)
highbank_binfo.loader_start =3D 0;
highbank_binfo.write_secondary_boot =3D hb_write_secondary;
highbank_binfo.secondary_cpu_reset_hook =3D hb_reset_secondary;
- if (!kvm_enabled()) {
- highbank_binfo.board_setup_addr =3D BOARD_SETUP_ADDR;
- highbank_binfo.write_board_setup =3D hb_write_board_setup;
- highbank_binfo.secure_board_setup =3D true;
- } else {
- warn_report("cannot load built-in Monitor support "
- "if KVM is enabled. Some guests (such as Linux) "
- "may not boot.");
- }
+ highbank_binfo.board_setup_addr =3D BOARD_SETUP_ADDR;
+ highbank_binfo.write_board_setup =3D hb_write_board_setup;
+ highbank_binfo.secure_board_setup =3D true;
=20
arm_load_kernel(ARM_CPU(first_cpu), machine, &highbank_binfo);
}
--=20
2.20.1