From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] qemu-kvm: Fix segfault on -no-kvm startup Date: Fri, 25 Sep 2009 18:05:49 +0200 Message-ID: <4ABCEA5D.4000209@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm-devel To: Avi Kivity , Marcelo Tosatti Return-path: Received: from david.siemens.de ([192.35.17.14]:23388 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753154AbZIYQGA (ORCPT ); Fri, 25 Sep 2009 12:06:00 -0400 Sender: kvm-owner@vger.kernel.org List-ID: 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 --- hw/apic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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 }