[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.7 20/25] qcow2: Switch .bdrv_co_discard() to by
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.7 20/25] qcow2: Switch .bdrv_co_discard() to byte-based |
Date: |
Tue, 19 Jul 2016 19:48:10 +0100 |
From: Eric Blake <address@hidden>
Another step towards killing off sector-based block APIs.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/qcow2.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a6bca73..d620d0a 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;
}
@@ -3410,7 +3410,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.7.4
- [Qemu-devel] [PULL for-2.7 10/25] block: Convert bdrv_aio_discard() to byte-based, (continued)
- [Qemu-devel] [PULL for-2.7 10/25] block: Convert bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 11/25] block: Convert BB interface to byte-based discards, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 12/25] raw-posix: Switch paio_submit() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 13/25] rbd: Switch rbd_start_aio() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 14/25] block: Convert .bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 15/25] block: Add .bdrv_co_pdiscard() driver callback, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 18/25] iscsi: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 17/25] gluster: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 19/25] nbd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 20/25] qcow2: Switch .bdrv_co_discard() to byte-based,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.7 21/25] raw_bsd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 22/25] sheepdog: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 23/25] block: Kill .bdrv_co_discard(), Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 24/25] nbd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- [Qemu-devel] [PULL for-2.7 25/25] raw_bsd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/19
- Re: [Qemu-devel] [PULL for-2.7 00/25] Block patches, Peter Maydell, 2016/07/20