diff options
| author | Kevin Wolf | 2018-03-22 14:11:20 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2018-06-18 15:03:25 +0200 |
| commit | 89bd030533e3592ca0a995450dcfc5d53e459e20 (patch) | |
| tree | 565f35b4251f99f5ea34d1d19f03a979f36c6df8 /include/block/block.h | |
| parent | block: Avoid unnecessary aio_poll() in AIO_WAIT_WHILE() (diff) | |
| download | qemu-89bd030533e3592ca0a995450dcfc5d53e459e20.tar.gz qemu-89bd030533e3592ca0a995450dcfc5d53e459e20.tar.xz qemu-89bd030533e3592ca0a995450dcfc5d53e459e20.zip | |
block: Really pause block jobs on drain
We already requested that block jobs be paused in .bdrv_drained_begin,
but no guarantee was made that the job was actually inactive at the
point where bdrv_drained_begin() returned.
This introduces a new callback BdrvChildRole.bdrv_drained_poll() and
uses it to make bdrv_drain_poll() consider block jobs using the node to
be drained.
For the test case to work as expected, we have to switch from
block_job_sleep_ns() to qemu_co_sleep_ns() so that the test job is even
considered active and must be waited for when draining the node.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block/block.h')
| -rw-r--r-- | include/block/block.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/block/block.h b/include/block/block.h index e677080c4e..cebbb39c6c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -568,6 +568,14 @@ void bdrv_parent_drained_begin(BlockDriverState *bs, BdrvChild *ignore); void bdrv_parent_drained_end(BlockDriverState *bs, BdrvChild *ignore); /** + * bdrv_drain_poll: + * + * Poll for pending requests in @bs and its parents (except for + * @ignore_parent). This is part of bdrv_drained_begin. + */ +bool bdrv_drain_poll(BlockDriverState *bs, BdrvChild *ignore_parent); + +/** * bdrv_drained_begin: * * Begin a quiesced section for exclusive access to the BDS, by disabling |