diff options
| -rw-r--r-- | kvm-all.c | 2 | ||||
| -rw-r--r-- | qemu-common.h | 3 | ||||
| -rw-r--r-- | vl.c | 8 |
3 files changed, 9 insertions, 4 deletions
@@ -605,7 +605,9 @@ int kvm_cpu_exec(CPUState *env) } kvm_arch_pre_run(env, run); + qemu_mutex_unlock_iothread(); ret = kvm_vcpu_ioctl(env, KVM_RUN, 0); + qemu_mutex_lock_iothread(); kvm_arch_post_run(env, run); if (ret == -EINTR || ret == -EAGAIN) { diff --git a/qemu-common.h b/qemu-common.h index 12e7dd0ada..820dd37a5d 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -146,6 +146,9 @@ char *qemu_strndup(const char *str, size_t size); void *get_mmap_addr(unsigned long size); +void qemu_mutex_lock_iothread(void); +void qemu_mutex_unlock_iothread(void); + /* Error handling. */ void QEMU_NORETURN hw_error(const char *fmt, ...) @@ -3560,8 +3560,8 @@ void qemu_notify_event(void) } } -#define qemu_mutex_lock_iothread() do { } while (0) -#define qemu_mutex_unlock_iothread() do { } while (0) +void qemu_mutex_lock_iothread(void) {} +void qemu_mutex_unlock_iothread(void) {} void vm_stop(int reason) { @@ -3760,7 +3760,7 @@ static void qemu_signal_lock(unsigned int msecs) qemu_mutex_unlock(&qemu_fair_mutex); } -static void qemu_mutex_lock_iothread(void) +void qemu_mutex_lock_iothread(void) { if (kvm_enabled()) { qemu_mutex_lock(&qemu_fair_mutex); @@ -3770,7 +3770,7 @@ static void qemu_mutex_lock_iothread(void) qemu_signal_lock(100); } -static void qemu_mutex_unlock_iothread(void) +void qemu_mutex_unlock_iothread(void) { qemu_mutex_unlock(&qemu_global_mutex); } |