* [PATCH] Fix -no-kvm with SMP
@ 2008-11-25 12:45 Jan Kiszka
2008-11-25 14:30 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2008-11-25 12:45 UTC (permalink / raw)
To: kvm-devel; +Cc: Avi Kivity
Fix condition for the !kvm_enabled() case.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
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())
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix -no-kvm with SMP
2008-11-25 12:45 [PATCH] Fix -no-kvm with SMP Jan Kiszka
@ 2008-11-25 14:30 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2008-11-25 14:30 UTC (permalink / raw)
To: Jan Kiszka; +Cc: kvm-devel
Jan Kiszka wrote:
> Fix condition for the !kvm_enabled() case.
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-25 14:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-25 12:45 [PATCH] Fix -no-kvm with SMP Jan Kiszka
2008-11-25 14:30 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).