motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 18:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Convert .bdrv_aio_discard() to byte-based

Browse source 
Another step towards byte-based interfaces everywhere.  Replace
the sector-based driver callback .bdrv_aio_discard() with a new
byte-based .bdrv_aio_pdiscard().  Only raw-posix and RBD drivers
are affected, so it was not worth splitting into multiple patches.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1468624988-423-9-git-send-email-eblake@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Eric Blake 2016-07-15 17:22:57 -06:00 • committed by Stefan Hajnoczi
parent 7bbca9e290
commit 4da444a0bb
4 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
block/io.c
View file

@ -2423,7 +2423,7 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset,
return 0; return 0;
} }
if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_aio_discard) { if (!bs->drv->bdrv_co_discard && !bs->drv->bdrv_aio_pdiscard) {
return 0; return 0;
} }
@ -2464,9 +2464,8 @@ int coroutine_fn bdrv_co_pdiscard(BlockDriverState *bs, int64_t offset,
.coroutine = qemu_coroutine_self(), .coroutine = qemu_coroutine_self(),
}; };
acb = bs->drv->bdrv_aio_discard(bs, offset >> BDRV_SECTOR_BITS, acb = bs->drv->bdrv_aio_pdiscard(bs, offset, num,
num >> BDRV_SECTOR_BITS, bdrv_co_io_em_complete, &co);
bdrv_co_io_em_complete, &co);
if (acb == NULL) { if (acb == NULL) {
ret = -EIO; ret = -EIO;
goto out; goto out;

18
block/raw-posix.c
View file

@ -1786,14 +1786,13 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
return ret | BDRV_BLOCK_OFFSET_VALID | start; return ret | BDRV_BLOCK_OFFSET_VALID | start;
} }
static coroutine_fn BlockAIOCB *raw_aio_discard(BlockDriverState *bs, static coroutine_fn BlockAIOCB *raw_aio_pdiscard(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int64_t offset, int count,
BlockCompletionFunc *cb, void *opaque) BlockCompletionFunc *cb, void *opaque)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
return paio_submit(bs, s->fd, sector_num << BDRV_SECTOR_BITS, NULL, return paio_submit(bs, s->fd, offset, NULL, count,
nb_sectors << BDRV_SECTOR_BITS,
cb, opaque, QEMU_AIO_DISCARD); cb, opaque, QEMU_AIO_DISCARD);
} }
@ -1865,7 +1864,7 @@ BlockDriver bdrv_file = {
.bdrv_co_preadv = raw_co_preadv, .bdrv_co_preadv = raw_co_preadv,
.bdrv_co_pwritev = raw_co_pwritev, .bdrv_co_pwritev = raw_co_pwritev,
.bdrv_aio_flush = raw_aio_flush, .bdrv_aio_flush = raw_aio_flush,
.bdrv_aio_discard = raw_aio_discard, .bdrv_aio_pdiscard = raw_aio_pdiscard,
.bdrv_refresh_limits = raw_refresh_limits, .bdrv_refresh_limits = raw_refresh_limits,
.bdrv_io_plug = raw_aio_plug, .bdrv_io_plug = raw_aio_plug,
.bdrv_io_unplug = raw_aio_unplug, .bdrv_io_unplug = raw_aio_unplug,
@ -2204,8 +2203,8 @@ static int fd_open(BlockDriverState *bs)
return -EIO; return -EIO;
} }
static coroutine_fn BlockAIOCB *hdev_aio_discard(BlockDriverState *bs, static coroutine_fn BlockAIOCB *hdev_aio_pdiscard(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int64_t offset, int count,
BlockCompletionFunc *cb, void *opaque) BlockCompletionFunc *cb, void *opaque)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -2213,8 +2212,7 @@ static coroutine_fn BlockAIOCB *hdev_aio_discard(BlockDriverState *bs,
if (fd_open(bs) < 0) { if (fd_open(bs) < 0) {
return NULL; return NULL;
} }
return paio_submit(bs, s->fd, sector_num << BDRV_SECTOR_BITS, NULL, return paio_submit(bs, s->fd, offset, NULL, count,
nb_sectors << BDRV_SECTOR_BITS,
cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV); cb, opaque, QEMU_AIO_DISCARD|QEMU_AIO_BLKDEV);
} }
@ -2309,7 +2307,7 @@ static BlockDriver bdrv_host_device = {
.bdrv_co_preadv = raw_co_preadv, .bdrv_co_preadv = raw_co_preadv,
.bdrv_co_pwritev = raw_co_pwritev, .bdrv_co_pwritev = raw_co_pwritev,
.bdrv_aio_flush = raw_aio_flush, .bdrv_aio_flush = raw_aio_flush,
.bdrv_aio_discard = hdev_aio_discard, .bdrv_aio_pdiscard = hdev_aio_pdiscard,
.bdrv_refresh_limits = raw_refresh_limits, .bdrv_refresh_limits = raw_refresh_limits,
.bdrv_io_plug = raw_aio_plug, .bdrv_io_plug = raw_aio_plug,
.bdrv_io_unplug = raw_aio_unplug, .bdrv_io_unplug = raw_aio_unplug,

15
block/rbd.c
View file

@ -930,14 +930,13 @@ static int qemu_rbd_snap_list(BlockDriverState *bs,
} }
#ifdef LIBRBD_SUPPORTS_DISCARD #ifdef LIBRBD_SUPPORTS_DISCARD
static BlockAIOCB* qemu_rbd_aio_discard(BlockDriverState *bs, static BlockAIOCB *qemu_rbd_aio_pdiscard(BlockDriverState *bs,
int64_t sector_num, int64_t offset,
int nb_sectors, int count,
BlockCompletionFunc *cb, BlockCompletionFunc *cb,
void *opaque) void *opaque)
{ {
return rbd_start_aio(bs, sector_num << BDRV_SECTOR_BITS, NULL, return rbd_start_aio(bs, offset, NULL, count, cb, opaque,
nb_sectors << BDRV_SECTOR_BITS, cb, opaque,
RBD_AIO_DISCARD); RBD_AIO_DISCARD);
} }
#endif #endif
@ -1001,7 +1000,7 @@ static BlockDriver bdrv_rbd = {
#endif #endif
#ifdef LIBRBD_SUPPORTS_DISCARD #ifdef LIBRBD_SUPPORTS_DISCARD
.bdrv_aio_discard = qemu_rbd_aio_discard, .bdrv_aio_pdiscard = qemu_rbd_aio_pdiscard,
#endif #endif
.bdrv_snapshot_create = qemu_rbd_snap_create, .bdrv_snapshot_create = qemu_rbd_snap_create,

4
include/block/block_int.h
View file

@ -142,8 +142,8 @@ struct BlockDriver {
BlockCompletionFunc *cb, void *opaque); BlockCompletionFunc *cb, void *opaque);
BlockAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs, BlockAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs,
BlockCompletionFunc *cb, void *opaque); BlockCompletionFunc *cb, void *opaque);
BlockAIOCB *(*bdrv_aio_discard)(BlockDriverState *bs, BlockAIOCB *(*bdrv_aio_pdiscard)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors, int64_t offset, int count,
BlockCompletionFunc *cb, void *opaque); BlockCompletionFunc *cb, void *opaque);
int coroutine_fn (*bdrv_co_readv)(BlockDriverState *bs, int coroutine_fn (*bdrv_co_readv)(BlockDriverState *bs,