| Message ID | 20210816135842.25302-4-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm: Avoid asserting in cpu_address_space_init() | expand |
On 8/16/21 3:58 PM, Peter Maydell wrote: > Now that the CPU realize function will fail cleanly if we ask for EL3 > when KVM is enabled, we don't need to check for errors explicitly in > the virt board code. The reported message is slightly different; > it is now: > qemu-system-aarch64: Cannot enable KVM when guest CPU has EL3 enabled > instead of: > qemu-system-aarch64: mach-virt: KVM does not support Security extensions > > We don't delete the MTE check because there the logic is more > complex; deleting the check would work but makes the error message > less helpful, as it would read: > qemu-system-aarch64: MTE requested, but not supported by the guest CPU > instead of: > qemu-system-aarch64: mach-virt: KVM does not support providing MTE to the guest CPU > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/arm/virt.c | 5 ----- > 1 file changed, 5 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 81eda46b0bb..86c8a4ca3d7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1852,11 +1852,6 @@ static void machvirt_init(MachineState *machine) } if (vms->secure) { - if (kvm_enabled()) { - error_report("mach-virt: KVM does not support Security extensions"); - exit(1); - } - /* * The Secure view of the world is the same as the NonSecure, * but with a few extra devices. Create it as a container region
Now that the CPU realize function will fail cleanly if we ask for EL3 when KVM is enabled, we don't need to check for errors explicitly in the virt board code. The reported message is slightly different; it is now: qemu-system-aarch64: Cannot enable KVM when guest CPU has EL3 enabled instead of: qemu-system-aarch64: mach-virt: KVM does not support Security extensions We don't delete the MTE check because there the logic is more complex; deleting the check would work but makes the error message less helpful, as it would read: qemu-system-aarch64: MTE requested, but not supported by the guest CPU instead of: qemu-system-aarch64: mach-virt: KVM does not support providing MTE to the guest CPU Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/arm/virt.c | 5 ----- 1 file changed, 5 deletions(-)