diff options
| author | Paolo Bonzini | 2016-11-29 12:33:34 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-01-16 14:25:17 +0100 |
| commit | 8f90b5e91df59fde0dfecc6738ff39f3edf14be5 (patch) | |
| tree | 9f31ddef66b5fab9ded29175f402c44444213cc6 /include/block | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' ... (diff) | |
| download | qemu-8f90b5e91df59fde0dfecc6738ff39f3edf14be5.tar.gz qemu-8f90b5e91df59fde0dfecc6738ff39f3edf14be5.tar.xz qemu-8f90b5e91df59fde0dfecc6738ff39f3edf14be5.zip | |
block: get rid of bdrv_io_unplugged_begin/end
bdrv_io_plug and bdrv_io_unplug are only called (via their
BlockBackend equivalents) after starting asynchronous I/O.
bdrv_drain is not going to be called while they are running,
because---even if a coroutine runs for some reason---it will
only drain in the next iteration of the event loop through
bdrv_co_yield_to_drain.
So this mechanism is unnecessary, get rid of it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20161129113334.605-1-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/block.h | 2 | ||||
| -rw-r--r-- | include/block/block_int.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/block/block.h b/include/block/block.h index 49bb0b239a..8b0dcdaa70 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -526,8 +526,6 @@ int bdrv_probe_geometry(BlockDriverState *bs, HDGeometry *geo); void bdrv_io_plug(BlockDriverState *bs); void bdrv_io_unplug(BlockDriverState *bs); -void bdrv_io_unplugged_begin(BlockDriverState *bs); -void bdrv_io_unplugged_end(BlockDriverState *bs); /** * bdrv_drained_begin: diff --git a/include/block/block_int.h b/include/block/block_int.h index 4e4562d444..2d92d7edfe 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -526,9 +526,8 @@ struct BlockDriverState { uint64_t write_threshold_offset; NotifierWithReturn write_threshold_notifier; - /* counters for nested bdrv_io_plug and bdrv_io_unplugged_begin */ + /* counter for nested bdrv_io_plug */ unsigned io_plugged; - unsigned io_plug_disabled; int quiesce_counter; }; |