diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-17 11:20:27 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-17 11:20:27 +0000 |
| commit | 02b351d8466a26c93bf35ff8fd5c316e6aee8c0f (patch) | |
| tree | 00cdc531a449ba44ca0e0920ca967b93dee76f90 /util/qemu-thread-win32.c | |
| parent | a8c611e1133f97c979922f41103f79309339dc27 (diff) | |
| parent | 7d506c90afa47facdb993bc19c15863eef584f1d (diff) | |
| download | focaccia-qemu-02b351d8466a26c93bf35ff8fd5c316e6aee8c0f.tar.gz focaccia-qemu-02b351d8466a26c93bf35ff8fd5c316e6aee8c0f.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 16 Jan 2017 13:38:52 GMT # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: async: optimize aio_bh_poll aio: document locking aio-win32: remove walking_handlers, protecting AioHandler list with list_lock aio-posix: remove walking_handlers, protecting AioHandler list with list_lock aio: tweak walking in dispatch phase aio-posix: split aio_dispatch_handlers out of aio_dispatch qemu-thread: optimize QemuLockCnt with futexes on Linux aio: make ctx->list_lock a QemuLockCnt, subsuming ctx->walking_bh qemu-thread: introduce QemuLockCnt aio: rename bh_lock to list_lock block: get rid of bdrv_io_unplugged_begin/end Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-thread-win32.c')
| -rw-r--r-- | util/qemu-thread-win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 728e76b5b2..178e0168a1 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -269,7 +269,7 @@ void qemu_sem_wait(QemuSemaphore *sem) * * Valid transitions: * - free->set, when setting the event - * - busy->set, when setting the event, followed by futex_wake + * - busy->set, when setting the event, followed by SetEvent * - set->free, when resetting the event * - free->busy, when waiting * |