mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull request

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAl55DNIACgkQnKSrs4Gr
 c8gIDQgAxLyvVtH44VuUPaUctMCTI+Snl/n+QoSFFHyvgrH0N2lpbfEcekbw+QRK
 AHbF0Lvh5fhjP4hYYa3WStj5BQV4h4hCfLv28vPyB8f0x+7PeV/aB5KIFrXM+yJ0
 xSGCZUlTJRDZI9ZM6/1tbnXJ1las+I3fITUgESDDGWxz/nWNiQtL9752yB5LOq99
 5lFOzGKbYyPA91Sq5526N8pY4CwFVQv2SSKzEAH5+F3mk0/SI3fOsVFMWeOj3TDp
 Rw+b+tyLfM6M3ssT3aFUs91ePjejDLOb7rJhWUs6N8cPeUOYMTU/Kd9S24uo4HV8
 gPK/vHhSC7bmDAzZT/AllwctJELVXQ==
 =UImd
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

Pull request

# gpg: Signature made Mon 23 Mar 2020 19:24:02 GMT
# 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 io_uring with external events

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-03-23 20:54:24 +00:00
commit f1e748d279
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/fdmon-io_uring.c
View File

@ -290,7 +290,18 @@ static int fdmon_io_uring_wait(AioContext *ctx, AioHandlerList *ready_list,
static bool fdmon_io_uring_need_wait(AioContext *ctx)
{
return io_uring_cq_ready(&ctx->fdmon_io_uring);
/* Have io_uring events completed? */
if (io_uring_cq_ready(&ctx->fdmon_io_uring)) {
return true;
}
/* Do we need to submit new io_uring sqes? */
if (!QSLIST_EMPTY_RCU(&ctx->submit_list)) {
return true;
}
/* Are we falling back to fdmon-poll? */
return atomic_read(&ctx->external_disable_cnt);
}
static const FDMonOps fdmon_io_uring_ops = {