Pull request

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl6HIyEACgkQnKSrs4Gr
 c8gfKgf9H2wBGsMA2l7wN5MKMw8R7/vTzTAnrW8prCbiioSQdpqOdmzif0nr0JvA
 +ck09eRMKrzdL4HQjJ4Hjj+o+FOq86jO4aMWdWLNY92LfvjHvXGzl/DQCdRy6d+3
 IjutR+PzSh5rfQcHbD+Za9YrRV5docsvVhvYqbvC6KWG8IAZWKpTMS+KTGp4OV9E
 yq2fQY4IQZJi6522aym9YYDw+CESqD6CbKHmv4NjLxlSQaZWZi1iJGYiXp+iQ4JH
 Yh+xEKd7YPhJgZ9ZKVMTa3+VlpfqzwcjBATAqHpQzhl2yTZHzKU4uynKcuWYrOML
 TJAbebXtJ/9keJ22PBG6XIaZ+duwTg==
 =ICDI
 -----END PGP SIGNATURE-----

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>

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;
     }