From b2b5cad9ccc7c65c43df17d7e7953680b35fd443 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Thu, 15 Jan 2009 15:23:27 +0200
Subject: [PATCH 59/70] kvm: qemu: Allow calling vm_stop() from vcpu thread

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Acked-by: Gleb Natapov <gleb@redhat.com>
---
 qemu/qemu-kvm.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 0763f5a..2ce9501 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -296,11 +296,15 @@ static void pause_all_threads(void)
 {
     CPUState *penv = first_cpu;
 
-    assert(!cpu_single_env);
-
     while (penv) {
-        penv->kvm_cpu_state.stop = 1;
-        pthread_kill(penv->kvm_cpu_state.thread, SIG_IPI);
+        if (penv != cpu_single_env) {
+            penv->kvm_cpu_state.stop = 1;
+            pthread_kill(penv->kvm_cpu_state.thread, SIG_IPI);
+        } else {
+            penv->kvm_cpu_state.stop = 0;
+            penv->kvm_cpu_state.stopped = 1;
+            cpu_interrupt(penv, CPU_INTERRUPT_EXIT);
+        }
         penv = (CPUState *)penv->next_cpu;
     }
 
-- 
1.6.1