mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-24 11:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

unlock iothread mutex before running kvm ioctl

Browse Source 
Without this, kvm will hold the mutex while it issues its run ioctl,
and never be able to step out of it, causing a deadlock.

Patchworks-ID: 35359
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Glauber Costa 2009-10-07 16:38:03 -03:00 committed by Anthony Liguori
parent ce88f890bd
commit d549db5a73
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kvm-all.c
View File

@ -605,7 +605,9 @@ int kvm_cpu_exec(CPUState *env)
} }
kvm_arch_pre_run(env, run); kvm_arch_pre_run(env, run);
qemu_mutex_unlock_iothread();
ret = kvm_vcpu_ioctl(env, KVM_RUN, 0); ret = kvm_vcpu_ioctl(env, KVM_RUN, 0);
qemu_mutex_lock_iothread();
kvm_arch_post_run(env, run); kvm_arch_post_run(env, run);
if (ret == -EINTR || ret == -EAGAIN) { if (ret == -EINTR || ret == -EAGAIN) {

3
qemu-common.h
View File

@ -146,6 +146,9 @@ char *qemu_strndup(const char *str, size_t size);
void *get_mmap_addr(unsigned long size); void *get_mmap_addr(unsigned long size);
void qemu_mutex_lock_iothread(void);
void qemu_mutex_unlock_iothread(void);
/* Error handling. */ /* Error handling. */
void QEMU_NORETURN hw_error(const char *fmt, ...) void QEMU_NORETURN hw_error(const char *fmt, ...)

8
vl.c
View File

@ -3560,8 +3560,8 @@ void qemu_notify_event(void)
} }
} }
#define qemu_mutex_lock_iothread() do { } while (0) void qemu_mutex_lock_iothread(void) {}
#define qemu_mutex_unlock_iothread() do { } while (0) void qemu_mutex_unlock_iothread(void) {}
void vm_stop(int reason) void vm_stop(int reason)
{ {
@ -3760,7 +3760,7 @@ static void qemu_signal_lock(unsigned int msecs)
qemu_mutex_unlock(&qemu_fair_mutex); qemu_mutex_unlock(&qemu_fair_mutex);
} }
static void qemu_mutex_lock_iothread(void) void qemu_mutex_lock_iothread(void)
{ {
if (kvm_enabled()) { if (kvm_enabled()) {
qemu_mutex_lock(&qemu_fair_mutex); qemu_mutex_lock(&qemu_fair_mutex);
@ -3770,7 +3770,7 @@ static void qemu_mutex_lock_iothread(void)
qemu_signal_lock(100); qemu_signal_lock(100);
} }
static void qemu_mutex_unlock_iothread(void) void qemu_mutex_unlock_iothread(void)
{ {
qemu_mutex_unlock(&qemu_global_mutex); qemu_mutex_unlock(&qemu_global_mutex);
} }