From patchwork Tue Jan 5 16:26:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Fix CPU topology initialization Date: Tue, 05 Jan 2010 06:26:34 -0000 From: Jiri Denemark X-Patchwork-Id: 42133 Message-Id: <416bd3c048a9b777180f2e2735e620f8b7206840.1262708768.git.jdenemar@redhat.com> To: qemu-devel@nongnu.org Late initialization of CPU topology in CPUState prevents KVM guests to actually see the topology. Signed-off-by: Jiri Denemark --- vl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vl.c b/vl.c index e881e45..a03d7a6 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)