summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:55:14 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-14 18:55:14 -0300
commite30f8de72e62ad097cad7b5fb42ce99b7e1b527b (patch)
tree57f84bbc115dc04b0aa15696e8c3ad6d8082ff34 /kvm-all.c
parentMerge commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe' into upstream-merge (diff)
parentunlock iothread mutex before running kvm ioctl (diff)
downloadqemu-kvm-e30f8de72e62ad097cad7b5fb42ce99b7e1b527b.tar.gz
qemu-kvm-e30f8de72e62ad097cad7b5fb42ce99b7e1b527b.tar.bz2
qemu-kvm-e30f8de72e62ad097cad7b5fb42ce99b7e1b527b.zip
Merge commit 'd549db5a732ef2ec145b84c5008a7585cf17cf67' into upstream-merge
* commit 'd549db5a732ef2ec145b84c5008a7585cf17cf67': (27 commits) unlock iothread mutex before running kvm ioctl TARGET_I386 is always defined if TARGET_X86_64 is defined slirp: fix !CONFIG_SLIRP compilation ide: BMDMAState don't need a pci_dev field anymore ide: cmd646 ->unit has just the value that we want ide: cmd646 we can get the pci device with container_of ide: 'secondary' field is only used by cmd646 ide: PCIIDEState type field is not needed anymore ide: split cmd646 and piix from pci.c ide: export needed ide-pci functions for split ide: create ide/pci.h for common ide pci definitions ide: remove uselsess casts from void * ide: Remove duplicated definitions ide: Remove cast in pci_register_bar ide: change cast to DO_UPCAST Fix bswap in comment Move dependency generation falgs out of configure configure: clean up temporary dependency files winwave: pause/restore playing upon seeing VOICE_DISABLE/ENABLE winwave: close event handle and delete wait object after closing HWAVEOUT ... Conflicts: vl.c Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 1356aa8d4..0a8aa4c27 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -609,7 +609,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) {