[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/23] hw/arm/highbank: Drop dead KVM support code
From: |
Peter Maydell |
Subject: |
[PULL 08/23] hw/arm/highbank: Drop dead KVM support code |
Date: |
Fri, 8 Jan 2021 15:36:06 +0000 |
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é <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"
#define SMP_BOOT_ADDR 0x100
#define SMP_BOOT_REG 0x40
@@ -396,15 +396,9 @@ static void calxeda_init(MachineState *machine, enum
cxmachines machine_id)
highbank_binfo.loader_start = 0;
highbank_binfo.write_secondary_boot = hb_write_secondary;
highbank_binfo.secondary_cpu_reset_hook = hb_reset_secondary;
- if (!kvm_enabled()) {
- highbank_binfo.board_setup_addr = BOARD_SETUP_ADDR;
- highbank_binfo.write_board_setup = hb_write_board_setup;
- highbank_binfo.secure_board_setup = 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 = BOARD_SETUP_ADDR;
+ highbank_binfo.write_board_setup = hb_write_board_setup;
+ highbank_binfo.secure_board_setup = true;
arm_load_kernel(ARM_CPU(first_cpu), machine, &highbank_binfo);
}
--
2.20.1
- [PULL 00/23] target-arm queue, Peter Maydell, 2021/01/08
- [PULL 01/23] intc/arm_gic: Fix gic_irq_signaling_enabled() for vCPUs, Peter Maydell, 2021/01/08
- [PULL 02/23] hw/arm/virt: Remove virt machine state 'smp_cpus', Peter Maydell, 2021/01/08
- [PULL 03/23] target/arm: Fix MTE0_ACTIVE, Peter Maydell, 2021/01/08
- [PULL 04/23] hw/intc/armv7m_nvic: Correct handling of CCR.BFHFNMIGN, Peter Maydell, 2021/01/08
- [PULL 05/23] target/arm: Correct store of FPSCR value via FPCXT_S, Peter Maydell, 2021/01/08
- [PULL 06/23] target/arm: Implement FPCXT_NS fp system register, Peter Maydell, 2021/01/08
- [PULL 07/23] target/arm: Implement Cortex-M55 model, Peter Maydell, 2021/01/08
- [PULL 08/23] hw/arm/highbank: Drop dead KVM support code,
Peter Maydell <=
- [PULL 10/23] scripts/coccinelle: New script to remove unnecessary timer_del() calls, Peter Maydell, 2021/01/08
- [PULL 09/23] util/qemu-timer: Make timer_free() imply timer_del(), Peter Maydell, 2021/01/08
- [PULL 12/23] target/arm: Remove timer_del()/timer_deinit() before timer_free(), Peter Maydell, 2021/01/08
- [PULL 11/23] Remove superfluous timer_del() calls, Peter Maydell, 2021/01/08
- [PULL 14/23] allwinner-a10-pit: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08
- [PULL 16/23] exynos4210_pwm: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08
- [PULL 13/23] digic-timer: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08
- [PULL 17/23] mss-timer: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08
- [PULL 19/23] exynos4210_mct: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08
- [PULL 18/23] musicpal: Use ptimer_free() in the finalize function to avoid memleaks, Peter Maydell, 2021/01/08