From: Gleb Natapov <[email protected]> env->exit_request is not used by kvm.
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 6865385..5460136 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -634,8 +634,7 @@ void kvm_arch_post_kvm_run(void *opaque, CPUState *env) int kvm_arch_has_work(CPUState *env) { - if (env->exit_request || - ((env->interrupt_request & CPU_INTERRUPT_HARD) && + if (((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || (env->interrupt_request & CPU_INTERRUPT_NMI)) return 1; diff --git a/qemu-kvm.c b/qemu-kvm.c index d3eba1a..4129fe2 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -1676,8 +1676,6 @@ static int kvm_pre_run(void *opaque, void *data) kvm_arch_pre_kvm_run(opaque, env); - if (env->exit_request) - return 1; pthread_mutex_unlock(&qemu_mutex); return 0; } @@ -1949,7 +1947,6 @@ static int kvm_main_loop_cpu(CPUState *env) } if (!env->halted || kvm_irqchip_in_kernel(kvm_context)) kvm_cpu_exec(env); - env->exit_request = 0; kvm_main_loop_wait(env, 0); } pthread_mutex_unlock(&qemu_mutex); diff --git a/vl.c b/vl.c index 845ed54..c08299c 100644 --- a/vl.c +++ b/vl.c @@ -3724,7 +3724,6 @@ void qemu_system_reset_request(void) } if (cpu_single_env) { qemu_kvm_cpu_stop(cpu_single_env); - cpu_exit(cpu_single_env); } qemu_notify_event(); } -- 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
