From: Gleb Natapov <[email protected]> When in-kernel irqchip is used env->halted is never used for anything except "info cpus" command. Halted state is synced in kvm_arch_save_mpstate() and showed by do_info_cpus() but otherwise never looked at. Zeroing it here breaks "info cpus" since before do_info_cpus() outputs env->halted in io thread it is zeroed here when vcpu thread reenters kernel.
Signed-off-by: Gleb Natapov <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 73b4af7..95b7aa5 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -922,10 +922,6 @@ void kvm_arch_load_regs(CPUState *env, int level) if (env->kvm_vcpu_update_vapic) kvm_tpr_enable_vapic(env); } - if (kvm_irqchip_in_kernel()) { - /* Avoid deadlock: no user space IRQ will ever clear it. */ - env->halted = 0; - } kvm_put_vcpu_events(env, level); kvm_put_debugregs(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
