From 3f7638ec4093100a63b18cbacd45dcd847f7c06b Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 5 Jan 2010 17:26:34 +0100 Subject: [PATCH] Fix CPU topology initialization Late initialization of CPU topology in CPUState prevents KVM guests to actually see the topology. Signed-off-by: Jiri Denemark Signed-off-by: Anthony Liguori --- vl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index 2b0b65347b..b048e891fa 100644 --- a/vl.c +++ b/vl.c @@ -3484,10 +3484,10 @@ void qemu_init_vcpu(void *_env) { CPUState *env = _env; - if (kvm_enabled()) - kvm_init_vcpu(env); env->nr_cores = smp_cores; env->nr_threads = smp_threads; + if (kvm_enabled()) + kvm_init_vcpu(env); return; } @@ -3813,12 +3813,12 @@ void qemu_init_vcpu(void *_env) { CPUState *env = _env; + env->nr_cores = smp_cores; + env->nr_threads = smp_threads; if (kvm_enabled()) kvm_start_vcpu(env); else tcg_init_vcpu(env); - env->nr_cores = smp_cores; - env->nr_threads = smp_threads; } void qemu_notify_event(void)