Skip to contentSkip to conversation

target/arm: Catch invalid kvm state also for hvf

PATCH In review Alexander Graf 2 participants 2 messages Jun 20, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 Hvf as well, let's run the same checks there as well.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1073

---
 target/arm/cpu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
target/arm/cpu.c +4 -4
index 1b5d535788..03510f29f9 100644
@@ -1490,7 +1490,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
         }
     }
 
-    if (kvm_enabled()) {
+    if (kvm_enabled() || hvf_enabled()) {
         /*
          * Catch all the cases which might cause us to create more than one
          * address space for the CPU (otherwise we will assert() later in
@@ -1498,17 +1498,17 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
          */
         if (arm_feature(env, ARM_FEATURE_M)) {
             error_setg(errp,
-                       "Cannot enable KVM when using an M-profile guest CPU");
+                       "Cannot enable KVM or HVF when using an M-profile guest CPU");
             return;
         }
         if (cpu->has_el3) {
             error_setg(errp,
-                       "Cannot enable KVM when guest CPU has EL3 enabled");
+                       "Cannot enable KVM or HVF when guest CPU has EL3 enabled");
             return;
         }
         if (cpu->tag_memory) {
             error_setg(errp,
-                       "Cannot enable KVM when guest CPUs has MTE enabled");
+                       "Cannot enable KVM or HVF when guest CPUs has MTE enabled");
             return;
         }
     }
Signature · 1 line
2.32.1 (Apple Git-133)
#1 lore raw

target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1493

Quoted 2 lines · Alexander Graf
target/arm/cpu.c +1 -1
-    if (kvm_enabled()) {
+    if (kvm_enabled() || hvf_enabled()) {

I think this should be !tcg_enabled(). No hw virtualization can use EL3 (or M-profile), only full emulation from TCG. There is such a thing as ARM on Windows, so I can imagine that WHPX may make a future appearance here.

(MTE may eventually be supported by virtualization, but it's not there yet.)

target/arm/cpu.c static void arm_cpu_realizefn(DeviceState *dev, Error **errp) · line 1503

Quoted 6 lines
         if (arm_feature(env, ARM_FEATURE_M)) {
             error_setg(errp,
target/arm/cpu.c +1 -1
-                       "Cannot enable KVM when using an M-profile guest CPU");
+                       "Cannot enable KVM or HVF when using an M-profile guest CPU");
             return;
         }

You can get the accelerator name from

    AccelClass *ac = ACCEL_GET_CLASS(current_accel());
    const char *name = ac->name;

r~