aboutsummaryrefslogtreecommitdiff
path: root/block/replication.c
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2018-04-24 17:01:57 -0500
committerKevin Wolf <kwolf@redhat.com>2018-05-15 16:11:41 +0200
commite18a58b4e3aa355a9b6eef1f39a980a4f18f1294 (patch)
tree146a95a5e75593be186f02dceef82ca8c86bee28 /block/replication.c
parentedfab6a08b0dc240ac3a665adf4dc40db9b9ec7f (diff)
downloadqemu-e18a58b4e3aa355a9b6eef1f39a980a4f18f1294.zip
qemu-e18a58b4e3aa355a9b6eef1f39a980a4f18f1294.tar.gz
qemu-e18a58b4e3aa355a9b6eef1f39a980a4f18f1294.tar.bz2
block: Merge .bdrv_co_writev{,_flags} in drivers
We have too many driver callback interfaces; simplify the mess somewhat by merging the flags parameter of .bdrv_co_writev_flags() into .bdrv_co_writev(). Note that as long as a driver doesn't set .supported_write_flags, the flags argument will be 0 and behavior is identical. Also note that the public function bdrv_co_writev() still lacks a flags argument; so the driver signature is thus intentionally slightly different. But that's not the end of the world, nor the first time that the driver interface differs slightly from the public interface. Ideally, we should be rewriting all of these drivers to use modern byte-based interfaces. But that's a more invasive patch to write and audit, compared to the simplification done here. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/replication.c')
-rw-r--r--block/replication.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/replication.c b/block/replication.c
index 6c0c718..48148b8 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -260,7 +260,8 @@ out:
static coroutine_fn int replication_co_writev(BlockDriverState *bs,
int64_t sector_num,
int remaining_sectors,
- QEMUIOVector *qiov)
+ QEMUIOVector *qiov,
+ int flags)
{
BDRVReplicationState *s = bs->opaque;
QEMUIOVector hd_qiov;
@@ -271,6 +272,7 @@ static coroutine_fn int replication_co_writev(BlockDriverState *bs,
int ret;
int64_t n;
+ assert(!flags);
ret = replication_get_io_status(s);
if (ret < 0) {
goto out;