From: Jan Kiszka <[email protected]> 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 <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]> diff --git a/hw/pc.c b/hw/pc.c index d819fca..0aebae9 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -787,11 +787,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 73381e2..e595a3e 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -2285,6 +2285,8 @@ CPUX86State *cpu_x86_init(const char *cpu_model) } mce_init(env); + qemu_init_vcpu(env); + return env; } -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
