diff options
| author | Peter Lieven <pl@kamp.de> | 2013-10-24 12:06:51 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-11-28 10:30:51 +0100 |
| commit | aa7bfbfff792538a9eeefe879fc4c629aa0b4203 (patch) | |
| tree | 76e999bf142961962cbce6bbfa3a3c9888e67ca3 /block | |
| parent | 6faac15fa80c4c1f813d96afc13bceaa3bc5ffe7 (diff) | |
| download | qemu-aa7bfbfff792538a9eeefe879fc4c629aa0b4203.zip qemu-aa7bfbfff792538a9eeefe879fc4c629aa0b4203.tar.gz qemu-aa7bfbfff792538a9eeefe879fc4c629aa0b4203.tar.bz2 | |
block: add flags to bdrv_*_write_zeroes
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/backup.c | 3 | ||||
| -rw-r--r-- | block/qcow2-cluster.c | 2 | ||||
| -rw-r--r-- | block/qcow2.c | 2 | ||||
| -rw-r--r-- | block/qed.c | 3 | ||||
| -rw-r--r-- | block/raw_bsd.c | 5 | ||||
| -rw-r--r-- | block/vmdk.c | 3 |
6 files changed, 11 insertions, 7 deletions
diff --git a/block/backup.c b/block/backup.c index cad14c9..830a179 100644 --- a/block/backup.c +++ b/block/backup.c @@ -138,7 +138,8 @@ static int coroutine_fn backup_do_cow(BlockDriverState *bs, if (buffer_is_zero(iov.iov_base, iov.iov_len)) { ret = bdrv_co_write_zeroes(job->target, - start * BACKUP_SECTORS_PER_CLUSTER, n); + start * BACKUP_SECTORS_PER_CLUSTER, + n, 0); } else { ret = bdrv_co_writev(job->target, start * BACKUP_SECTORS_PER_CLUSTER, n, diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 791083a..11f9c50 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1613,7 +1613,7 @@ static int expand_zero_clusters_in_l1(BlockDriverState *bs, uint64_t *l1_table, } ret = bdrv_write_zeroes(bs->file, offset / BDRV_SECTOR_SIZE, - s->cluster_sectors); + s->cluster_sectors, 0); if (ret < 0) { if (!preallocated) { qcow2_free_clusters(bs, offset, s->cluster_size, diff --git a/block/qcow2.c b/block/qcow2.c index 6e5d98d..2fe37ed 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1696,7 +1696,7 @@ static int qcow2_make_empty(BlockDriverState *bs) } static coroutine_fn int qcow2_co_write_zeroes(BlockDriverState *bs, - int64_t sector_num, int nb_sectors) + int64_t sector_num, int nb_sectors, BdrvRequestFlags flags) { int ret; BDRVQcowState *s = bs->opaque; diff --git a/block/qed.c b/block/qed.c index 6c0cba0..adc2736 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1397,7 +1397,8 @@ static void coroutine_fn qed_co_write_zeroes_cb(void *opaque, int ret) static int coroutine_fn bdrv_qed_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, - int nb_sectors) + int nb_sectors, + BdrvRequestFlags flags) { BlockDriverAIOCB *blockacb; BDRVQEDState *s = bs->opaque; diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 2265dcc..fb5181b 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -68,9 +68,10 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs, } static int coroutine_fn raw_co_write_zeroes(BlockDriverState *bs, - int64_t sector_num, int nb_sectors) + int64_t sector_num, int nb_sectors, + BdrvRequestFlags flags) { - return bdrv_co_write_zeroes(bs->file, sector_num, nb_sectors); + return bdrv_co_write_zeroes(bs->file, sector_num, nb_sectors, flags); } static int coroutine_fn raw_co_discard(BlockDriverState *bs, diff --git a/block/vmdk.c b/block/vmdk.c index a7ebd0f..6555663 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1419,7 +1419,8 @@ static coroutine_fn int vmdk_co_write(BlockDriverState *bs, int64_t sector_num, static int coroutine_fn vmdk_co_write_zeroes(BlockDriverState *bs, int64_t sector_num, - int nb_sectors) + int nb_sectors, + BdrvRequestFlags flags) { int ret; BDRVVmdkState *s = bs->opaque; |