[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 15/25] block: Add .bdrv_co_pdiscard() driver callb
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL v2 15/25] block: Add .bdrv_co_pdiscard() driver callback |
Date: |
Wed, 20 Jul 2016 17:21:12 +0100 |
From: Eric Blake <address@hidden>
There's enough drivers with a sector-based callback that it will
be easier to switch one at a time. This patch adds a byte-based
callback, and then after all drivers are swapped, we'll drop the
sector-based callback.
[checkpatch doesn't like the space after coroutine_fn in
block_int.h, but it's consistent with the rest of the file]
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/io.c | 7 +++++--
include/block/block_int.h | 2 ++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index 5c759fa..5ba0195 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2423,7 +2423,8 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs,
int64_t offset,
return 0;
}
- if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_aio_pdiscard) {
+ if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_co_pdiscard &&
+ !bs->drv->bdrv_aio_pdiscard) {
return 0;
}
@@ -2455,7 +2456,9 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs,
int64_t offset,
int ret;
int num = MIN(count, max_pdiscard);
- if (bs->drv->bdrv_co_discard) {
+ if (bs->drv->bdrv_co_pdiscard) {
+ ret = bs->drv->bdrv_co_pdiscard(bs, offset, num);
+ } else if (bs->drv->bdrv_co_discard) {
ret = bs->drv->bdrv_co_discard(bs, offset >> BDRV_SECTOR_BITS,
num >> BDRV_SECTOR_BITS);
} else {
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 9bf9aed..8f16d16 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -167,6 +167,8 @@ struct BlockDriver {
int64_t offset, int count, BdrvRequestFlags flags);
int coroutine_fn (*bdrv_co_discard)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors);
+ int coroutine_fn (*bdrv_co_pdiscard)(BlockDriverState *bs,
+ int64_t offset, int count);
int64_t coroutine_fn (*bdrv_co_get_block_status)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int *pnum,
BlockDriverState **file);
--
2.7.4
- [Qemu-devel] [PULL v2 05/25] nbd: Drop unused offset parameter, (continued)
- [Qemu-devel] [PULL v2 05/25] nbd: Drop unused offset parameter, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 06/25] iscsi: Rely on block layer to break up large requests, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 07/25] block: Convert bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 09/25] block: Switch BlockRequest to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 08/25] block: Convert bdrv_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 10/25] block: Convert bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 11/25] block: Convert BB interface to byte-based discards, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 13/25] rbd: Switch rbd_start_aio() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 12/25] raw-posix: Switch paio_submit() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 14/25] block: Convert .bdrv_aio_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 15/25] block: Add .bdrv_co_pdiscard() driver callback,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL v2 18/25] iscsi: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 16/25] blkreplay: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 17/25] gluster: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 19/25] nbd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 20/25] qcow2: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 22/25] sheepdog: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 21/25] raw_bsd: Switch .bdrv_co_discard() to byte-based, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 23/25] block: Kill .bdrv_co_discard(), Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 24/25] nbd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/20
- [Qemu-devel] [PULL v2 25/25] raw_bsd: Convert to byte-based interface, Stefan Hajnoczi, 2016/07/20