From: Jan Kiszka <[email protected]> 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 <[email protected]> Signed-off-by: Avi Kivity <[email protected]> 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
