While at it, drop the current_cpu assignment since this is a per-thread variable on modern QEMU.
Cc: Vincent Palatin <vpala...@chromium.org> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- target/i386/hax-all.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index 097db5c..ba6117d 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -514,9 +514,10 @@ static int hax_vcpu_hax_exec(CPUArchState *env) hax_vcpu_interrupt(env); qemu_mutex_unlock_iothread(); + cpu_exec_start(cpu); hax_ret = hax_vcpu_run(vcpu); + cpu_exec_end(cpu); qemu_mutex_lock_iothread(); - current_cpu = cpu; /* Simply continue the vcpu_run if system call interrupted */ if (hax_ret == -EINTR || hax_ret == -EAGAIN) { -- 1.8.3.1