diff options
| author | Peter Maydell | 2020-04-03 16:30:11 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-04-03 16:30:11 +0200 |
| commit | 146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8 (patch) | |
| tree | 7a10cb4db7b2757a238a958ec7aa9595d3614b09 | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200403' into staging (diff) | |
| parent | aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring (diff) | |
| download | qemu-146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8.tar.gz qemu-146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8.tar.xz qemu-146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Fri 03 Apr 2020 12:50:57 BST
# gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | util/fdmon-io_uring.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c index 7e143ef515..b4d6109f20 100644 --- a/util/fdmon-io_uring.c +++ b/util/fdmon-io_uring.c @@ -295,7 +295,12 @@ static bool fdmon_io_uring_need_wait(AioContext *ctx) return true; } - /* Do we need to submit new io_uring sqes? */ + /* Are there pending sqes to submit? */ + if (io_uring_sq_ready(&ctx->fdmon_io_uring)) { + return true; + } + + /* Do we need to process AioHandlers for io_uring changes? */ if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) { return true; } |