diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 18:55:14 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 18:55:14 -0300 |
| commit | e30f8de72e62ad097cad7b5fb42ce99b7e1b527b (patch) | |
| tree | 57f84bbc115dc04b0aa15696e8c3ad6d8082ff34 /qemu-common.h | |
| parent | Merge commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe' into upstream-merge (diff) | |
| parent | unlock iothread mutex before running kvm ioctl (diff) | |
| download | qemu-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 'qemu-common.h')
| -rw-r--r-- | qemu-common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qemu-common.h b/qemu-common.h index 875010bd9..b264207c4 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, ...) |