diff options
| -rw-r--r-- | block/io.c | 7 | ||||
| -rw-r--r-- | include/block/block_int.h | 2 |
2 files changed, 7 insertions, 2 deletions
@@ -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); |