Skip to contentSkip to conversation

Fix -no-kvm with SMP

PATCH Applied Jan Kiszka 2 participants 2 messages Nov 25, 2008 KVM

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 Fix -no-kvm with SMP

Fix condition for the !kvm_enabled() case.

Signed-off-by Jan Kiszka <[email protected]>

---

 qemu/hw/apic.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
qemu/hw/apic.c +2 -1
index 8836784..6657276 100644
@@ -436,7 +436,8 @@ static void apic_init_ipi(APICState *s)
 
     cpu_reset(s->cpu_env);
 
-    if (!(s->apicbase & MSR_IA32_APICBASE_BSP) && !qemu_kvm_irqchip_in_kernel())
+    if (!(s->apicbase & MSR_IA32_APICBASE_BSP) &&
+        (!kvm_enabled() || !qemu_kvm_irqchip_in_kernel()))
         s->cpu_env->halted = 1;
 
     if (kvm_enabled() && !qemu_kvm_irqchip_in_kernel())
Applied
#1 lore raw
Quoted 3 lines · Jan Kiszka

Fix condition for the !kvm_enabled() case.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function