From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] Fix -no-kvm with SMP Date: Tue, 25 Nov 2008 13:45:20 +0100 Message-ID: <492BF360.6040709@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Avi Kivity To: kvm-devel Return-path: Received: from gecko.sbs.de ([194.138.37.40]:15950 "EHLO gecko.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068AbYKYMqu (ORCPT ); Tue, 25 Nov 2008 07:46:50 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Fix condition for the !kvm_enabled() case. Signed-off-by: Jan Kiszka --- 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())