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(-)
diff --git a/qemu/hw/apic.c b/qemu/hw/apic.c
index 8836784..6657276 100644
--- a/qemu/hw/apic.c
+++ b/qemu/hw/apic.c
@@ -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())
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
