From 9857c2d2f7fb09fe37d7a72b004b1f7bcf70248c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 30 Jan 2018 16:28:49 +0100 Subject: cpus: hax: register/unregister thread with RCU, exit loop on unplug Signed-off-by: Paolo Bonzini --- cpus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index 2cb0af9b22..08a84628c1 100644 --- a/cpus.c +++ b/cpus.c @@ -1473,6 +1473,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); @@ -1484,7 +1485,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) { @@ -1493,7 +1494,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; } -- cgit v1.2.1