ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/arm: Catch invalid kvm state also for hvf 

Some features such as running in EL3 or running M profile code are
incompatible with virtualization as QEMU implements it today. To prevent
users from picking invalid configurations on other virt solutions like
Hvf, let's run the same checks there too.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1073
Signed-off-by: Alexander Graf <agraf@csgraf.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220620192242.70573-2-agraf@csgraf.de
[PMM: Allow qtest accelerator too; tweak comment]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alexander Graf 2022-06-24 15:42:56 +01:00 committed by Peter Maydell
parent 55bd445c41
commit 045e50641f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
target/arm/cpu.c
View File

@ -39,6 +39,7 @@
#include "hw/boards.h"
#endif
#include "sysemu/tcg.h"
#include "sysemu/qtest.h"
#include "sysemu/hw_accel.h"
#include "kvm_arm.h"
#include "disas/capstone.h"
@ -1490,25 +1491,32 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
}
}
if (kvm_enabled()) {
if (!tcg_enabled() && !qtest_enabled()) {
/*
* We assume that no accelerator except TCG (and the "not really an
* accelerator" qtest) can handle these features, because Arm hardware
* virtualization can't virtualize them.
*
* Catch all the cases which might cause us to create more than one
* address space for the CPU (otherwise we will assert() later in
* cpu_address_space_init()).
*/
if (arm_feature(env, ARM_FEATURE_M)) {
error_setg(errp,
"Cannot enable KVM when using an M-profile guest CPU");
"Cannot enable %s when using an M-profile guest CPU",
current_accel_name());
return;
}
if (cpu->has_el3) {
error_setg(errp,
"Cannot enable KVM when guest CPU has EL3 enabled");
"Cannot enable %s when guest CPU has EL3 enabled",
current_accel_name());
return;
}
if (cpu->tag_memory) {
error_setg(errp,
"Cannot enable KVM when guest CPUs has MTE enabled");
"Cannot enable %s when guest CPUs has MTE enabled",
current_accel_name());
return;
}
}