diff options
| author | Peter Maydell | 2020-12-15 15:42:15 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-08 16:13:38 +0100 |
| commit | 416dd95295b1c13fc9f1f2dbb2803ad581de415a (patch) | |
| tree | 225baf22bb08b238fa3ccd635f289b7e96f7be78 /hw/arm/highbank.c | |
| parent | target/arm: Implement Cortex-M55 model (diff) | |
| download | qemu-416dd95295b1c13fc9f1f2dbb2803ad581de415a.tar.gz qemu-416dd95295b1c13fc9f1f2dbb2803ad581de415a.tar.xz qemu-416dd95295b1c13fc9f1f2dbb2803ad581de415a.zip | |
hw/arm/highbank: Drop dead KVM support code
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
Diffstat (limited to 'hw/arm/highbank.c')
| -rw-r--r-- | hw/arm/highbank.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index bf7b8f4c64..bf886268c5 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); } |