[PATCH v3 10/10] qemu-kvm: Bring qemu_init_vcpu back home

Jan Kiszka
2010-02-24T14:18:22Z

There is no need for the this hack anymore, initialization is now robust
against reordering as it doesn't try to write the VCPU state on its own.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
hw/pc.c | 5 -----
target-i386/helper.c | 2 ++
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 971ae70..a83f96e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -752,11 +752,6 @@ CPUState *pc_new_cpu(const char *cpu_model)
} else {
qemu_register_reset((QEMUResetHandler*)cpu_reset, env);
}
-
- /* kvm needs this to run after the apic is initialized. Otherwise,
- * it can access invalid state and crash.
- */
- qemu_init_vcpu(env);
return env;
}

diff --git a/target-i386/helper.c b/target-i386/helper.c
index f9d63f6..f83e8cc 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1953,6 +1953,8 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
}
mce_init(env);

+ qemu_init_vcpu(env);
+
return env;
}

--
1.6.0.2