diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 10:49:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 10:49:02 +0000 |
| commit | 834eddf22ec762839b724538c7be1d1d3b2d9d3b (patch) | |
| tree | 0b0a5cc0ede08b8df8706a074579687ebcab5559 /util | |
| parent | 73988d529e2edfc0c83cb73c07f818fdfebd633c (diff) | |
| parent | 7376eda7c2e0451e819e81bd05fabc56a9deb946 (diff) | |
| download | qemu-834eddf22ec762839b724538c7be1d1d3b2d9d3b.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Mon 12 Mar 2018 16:01:16 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# 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:
block: make BDRV_POLL_WHILE() re-entrancy safe
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/aio-wait.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/aio-wait.c b/util/aio-wait.c index 975afddf4c..b8a8f86dba 100644 --- a/util/aio-wait.c +++ b/util/aio-wait.c @@ -34,7 +34,7 @@ static void dummy_bh_cb(void *opaque) void aio_wait_kick(AioWait *wait) { /* The barrier (or an atomic op) is in the caller. */ - if (atomic_read(&wait->need_kick)) { + if (atomic_read(&wait->num_waiters)) { aio_bh_schedule_oneshot(qemu_get_aio_context(), dummy_bh_cb, NULL); } } |