[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 14/17] qcow2: Switch .bdrv_co_discard() to byte-base
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH 14/17] qcow2: Switch .bdrv_co_discard() to byte-based |
Date: |
Wed, 22 Jun 2016 09:51:11 -0600 |
Another step towards killing off sector-based block APIs.
Signed-off-by: Eric Blake <address@hidden>
---
block/qcow2.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index fdf13cb..d368aa5 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2479,15 +2479,15 @@ static coroutine_fn int
qcow2_co_pwrite_zeroes(BlockDriverState *bs,
return ret;
}
-static coroutine_fn int qcow2_co_discard(BlockDriverState *bs,
- int64_t sector_num, int nb_sectors)
+static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs,
+ int64_t offset, int count)
{
int ret;
BDRVQcow2State *s = bs->opaque;
qemu_co_mutex_lock(&s->lock);
- ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS,
- nb_sectors, QCOW2_DISCARD_REQUEST, false);
+ ret = qcow2_discard_clusters(bs, offset, count >> BDRV_SECTOR_BITS,
+ QCOW2_DISCARD_REQUEST, false);
qemu_co_mutex_unlock(&s->lock);
return ret;
}
@@ -3365,7 +3365,7 @@ BlockDriver bdrv_qcow2 = {
.bdrv_co_flush_to_os = qcow2_co_flush_to_os,
.bdrv_co_pwrite_zeroes = qcow2_co_pwrite_zeroes,
- .bdrv_co_discard = qcow2_co_discard,
+ .bdrv_co_pdiscard = qcow2_co_pdiscard,
.bdrv_truncate = qcow2_truncate,
.bdrv_write_compressed = qcow2_write_compressed,
.bdrv_make_empty = qcow2_make_empty,
--
2.5.5
- [Qemu-block] [PATCH 03/17] block: Switch BlockRequest to byte-based, (continued)
- [Qemu-block] [PATCH 03/17] block: Switch BlockRequest to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 02/17] block: Convert bdrv_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 04/17] block: Convert bdrv_aio_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 10/17] blkreplay: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 01/17] block: Convert bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 11/17] gluster: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 12/17] iscsi: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 05/17] block: Convert BB interface to byte-based discards, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 13/17] nbd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 15/17] raw_bsd: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 14/17] qcow2: Switch .bdrv_co_discard() to byte-based,
Eric Blake <=
- [Qemu-block] [PATCH 06/17] raw-posix: Switch paio_submit() to byte-based, Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 17/17] block: Kill .bdrv_co_discard(), Eric Blake, 2016/06/22
- [Qemu-block] [PATCH 16/17] sheepdog: Switch .bdrv_co_discard() to byte-based, Eric Blake, 2016/06/22