diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-10-17 12:32:13 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-21 17:34:13 +0200 |
| commit | 6f6dc6565e2b65ec8c0cf47622b4f5f1468d194e (patch) | |
| tree | 9c15371a4bea7698a2f29ff1e6266612c789a427 /block/raw.c | |
| parent | 07f076157475e1a8ea454e304e0ea5496d05b539 (diff) | |
block: drop redundant bdrv_flush implementation
Block drivers now only need to provide either of .bdrv_co_flush,
.bdrv_aio_flush() or for legacy drivers .bdrv_flush(). Remove
the redundant .bdrv_flush() implementations.
[Paolo Bonzini: change raw driver to bdrv_co_flush]
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/raw.c')
| -rw-r--r-- | block/raw.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/block/raw.c b/block/raw.c index 5ca606b68a..39a3a9afae 100644 --- a/block/raw.c +++ b/block/raw.c @@ -25,15 +25,9 @@ static void raw_close(BlockDriverState *bs) { } -static int raw_flush(BlockDriverState *bs) +static int coroutine_fn raw_co_flush(BlockDriverState *bs) { - return bdrv_flush(bs->file); -} - -static BlockDriverAIOCB *raw_aio_flush(BlockDriverState *bs, - BlockDriverCompletionFunc *cb, void *opaque) -{ - return bdrv_aio_flush(bs->file, cb, opaque); + return bdrv_co_flush(bs->file); } static int64_t raw_getlength(BlockDriverState *bs) @@ -117,12 +111,11 @@ static BlockDriver bdrv_raw = { .bdrv_close = raw_close, .bdrv_co_readv = raw_co_readv, .bdrv_co_writev = raw_co_writev, - .bdrv_flush = raw_flush, + .bdrv_co_flush = raw_co_flush, .bdrv_probe = raw_probe, .bdrv_getlength = raw_getlength, .bdrv_truncate = raw_truncate, - .bdrv_aio_flush = raw_aio_flush, .bdrv_discard = raw_discard, .bdrv_is_inserted = raw_is_inserted, |