[Qemu-commits] [qemu/qemu] ae60ab: aio-posix: fix test-aio /aio/event/wait with fdmon...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ae60ab7eb20715fa63cca1b0bb4493e160da51ce
      
https://github.com/qemu/qemu/commit/ae60ab7eb20715fa63cca1b0bb4493e160da51ce
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2020-04-03 (Fri, 03 Apr 2020)

  Changed paths:
    M util/fdmon-io_uring.c

  Log Message:
  -----------
  aio-posix: fix test-aio /aio/event/wait with fdmon-io_uring

When a file descriptor becomes ready we must re-arm POLL_ADD.  This is
done by adding an sqe to the io_uring sq ring.  The ->need_wait()
function wasn't taking pending sqes into account and therefore
io_uring_submit_and_wait() was not being called.  Polling for cqes
failed to detect fd readiness since we hadn't submitted the sqe to
io_uring.

This patch fixes the following tests/test-aio -p /aio/event/wait
failure:

  ok 11 /aio/event/wait
  **
  ERROR:tests/test-aio.c:374:test_flush_event_notifier: assertion failed: 
(aio_poll(ctx, false))

Reported-by: Cole Robinson <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Tested-by: Cole Robinson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Fixes: 73fd282e7b6dd4e4ea1c3bbb3d302c8db51e4ccf
       ("aio-posix: add io_uring fd monitoring implementation")
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8
      
https://github.com/qemu/qemu/commit/146aa0f104bb3bf88e43c4082a0bfc4bbda4fbd8
  Author: Peter Maydell <address@hidden>
  Date:   2020-04-03 (Fri, 03 Apr 2020)

  Changed paths:
    M util/fdmon-io_uring.c

  Log Message:
  -----------
  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 <address@hidden>" [full]
# gpg:                 aka "Stefan Hajnoczi <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/64a3b4d53d34...146aa0f104bb