diff mbox

[8/8] env->exit_request is not used by kvm.

Message ID 1245072197-7538-9-git-send-email-gleb@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gleb Natapov June 15, 2009, 1:23 p.m. UTC 
Remove its use from kvm code.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 qemu-kvm-x86.c |    3 +--
 qemu-kvm.c     |    3 ---
 vl.c           |    1 -
 3 files changed, 1 insertions(+), 6 deletions(-)
diff mbox

Patch

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 2930a1d..bbdb03a 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -168,8 +168,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;
 }
@@ -441,7 +439,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();
 }