[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kvm-commits
Subject:    [COMMIT master] Fix segfault on -no-kvm startup
From:       Avi Kivity <avi () redhat ! com>
Date:       2009-09-27 10:49:29
Message-ID: 20090927104929.1FEDAA0153 () cleopatra ! tlv ! redhat ! com
[Download RAW message or body]

From: Jan Kiszka <jan.kiszka@siemens.com>

The check for in-kernel irqchip must be protected by kvm_enabled, and we
have a different wrapper for it.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

diff --git a/hw/apic.c b/hw/apic.c
index 3a2e128..01ac174 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -509,9 +509,10 @@ void apic_init_reset(CPUState *env)
 
     env->halted = !(s->apicbase & MSR_IA32_APICBASE_BSP);
 #ifdef KVM_CAP_MP_STATE
-    if (kvm_irqchip_in_kernel(kvm_context))
+    if (kvm_enabled() && qemu_kvm_irqchip_in_kernel()) {
         env->mp_state
             = env->halted ? KVM_MP_STATE_UNINITIALIZED : KVM_MP_STATE_RUNNABLE;
+    }
 #endif
 }
 
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]