v2: * Introduce AIO_WAIT_WHILE() since aio_poll(ctx, true) is not allowed [Paolo]
Using bdrv_inc_in_flight(blk_bs(blk)) doesn't work since BlockBackend->root may be NULL. This patch series solves the issue by adding an BlockBackend->in_flight counter so requests can be tracked even when there is no BlockDriverState. This should fix the IDE and virtio-blk segfaults that have been encountered when there is no BlockDriverState. The patch is based on work by Kevin Wolf. Kevin Wolf (1): block: test blk_aio_flush() with blk->root == NULL Stefan Hajnoczi (3): block: extract AIO_WAIT_WHILE() from BlockDriverState block: add BlockBackend->in_flight counter Revert "IDE: Do not flush empty CDROM drives" tests/Makefile.include | 2 + util/Makefile.objs | 2 +- include/block/aio-wait.h | 116 +++++++++++++++++++++++++++++++++++++++++++++ include/block/block.h | 40 +++------------- include/block/block_int.h | 7 ++- block.c | 7 ++- block/block-backend.c | 60 ++++++++++++++++++++--- block/io.c | 10 +--- hw/ide/core.c | 10 +--- tests/test-block-backend.c | 82 ++++++++++++++++++++++++++++++++ util/aio-wait.c | 40 ++++++++++++++++ 11 files changed, 313 insertions(+), 63 deletions(-) create mode 100644 include/block/aio-wait.h create mode 100644 tests/test-block-backend.c create mode 100644 util/aio-wait.c -- 2.14.3