diff mbox series

[1/6] cpus: hax: register/unregister thread with RCU, exit loop on unplug

Message ID 20180201144430.14441-2-pbonzini@redhat.com
State New
Headers show
Series cpus: fix various issues with vCPU unplug | expand

Commit Message

Paolo Bonzini Feb. 1, 2018, 2:44 p.m. UTC 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/cpus.c b/cpus.c
index 1495ed5c36..231550a0d8 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1474,6 +1474,7 @@  static void *qemu_hax_cpu_thread_fn(void *arg)
     CPUState *cpu = arg;
     int r;
 
+    rcu_register_thread();
     qemu_mutex_lock_iothread();
     qemu_thread_get_self(cpu->thread);
 
@@ -1485,7 +1486,7 @@  static void *qemu_hax_cpu_thread_fn(void *arg)
     hax_init_vcpu(cpu);
     qemu_cond_signal(&qemu_cpu_cond);
 
-    while (1) {
+    do {
         if (cpu_can_run(cpu)) {
             r = hax_smp_cpu_exec(cpu);
             if (r == EXCP_DEBUG) {
@@ -1494,7 +1495,8 @@  static void *qemu_hax_cpu_thread_fn(void *arg)
         }
 
         qemu_wait_io_event(cpu);
-    }
+    } while (!cpu->unplug || cpu_can_run(cpu));
+    rcu_unregister_thread();
     return NULL;
 }