From d9f67ef986298f63a696d849df90f73f0403e36a Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Wed, 21 Mar 2012 21:54:49 +0100 Subject: [PATCH 22/55] block: add bdrv_co_is_allocated() interface RH-Author: Jeffrey Cody Message-id: Patchwork-id: 38873 O-Subject: [RHEL6.3 qemu-kvm PATCH v8 22/54] block: add bdrv_co_is_allocated() interface Bugzilla: 582475 RH-Acked-by: Paolo Bonzini RH-Acked-by: Marcelo Tosatti RH-Acked-by: Kevin Wolf From: Stefan Hajnoczi This patch introduces the public bdrv_co_is_allocated() interface which can be used to query image allocation status while the VM is running. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit 060f51c9dee3c58e2748c773ef1f7142047a4a2f) Signed-off-by: Stefan Hajnoczi Signed-off-by: Anthony Liguori Signed-off-by: Jeff Cody --- block.c | 37 ++++++++++++++++++++++++------------- block.h | 2 ++ 2 files changed, 26 insertions(+), 13 deletions(-) Signed-off-by: Michal Novotny --- block.c | 37 ++++++++++++++++++++++++------------- block.h | 2 ++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index 6666aba..fdbfbd5 100644 --- a/block.c +++ b/block.c @@ -1765,17 +1765,6 @@ typedef struct BdrvCoIsAllocatedData { bool done; } BdrvCoIsAllocatedData; -/* Coroutine wrapper for bdrv_is_allocated() */ -static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque) -{ - BdrvCoIsAllocatedData *data = opaque; - BlockDriverState *bs = data->bs; - - data->ret = bs->drv->bdrv_co_is_allocated(bs, data->sector_num, - data->nb_sectors, data->pnum); - data->done = true; -} - /* * Returns true iff the specified sector is present in the disk image. Drivers * not implementing the functionality are assumed to not support backing files, @@ -1787,8 +1776,8 @@ static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque) * * 'nb_sectors' is the max value 'pnum' should be set to. */ -int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, - int *pnum) +int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, int *pnum) { if (!bs->drv->bdrv_co_is_allocated) { int64_t n; @@ -1801,6 +1790,28 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, return 1; } + return bs->drv->bdrv_co_is_allocated(bs, sector_num, nb_sectors, pnum); +} + +/* Coroutine wrapper for bdrv_is_allocated() */ +static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque) +{ + BdrvCoIsAllocatedData *data = opaque; + BlockDriverState *bs = data->bs; + + data->ret = bdrv_co_is_allocated(bs, data->sector_num, data->nb_sectors, + data->pnum); + data->done = true; +} + +/* + * Synchronous wrapper around bdrv_co_is_allocated(). + * + * See bdrv_co_is_allocated() for details. + */ +int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors, + int *pnum) +{ Coroutine *co; BdrvCoIsAllocatedData data = { .bs = bs, diff --git a/block.h b/block.h index 56cf8e6..330ed10 100644 --- a/block.h +++ b/block.h @@ -147,6 +147,8 @@ int coroutine_fn bdrv_co_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); int coroutine_fn bdrv_co_writev(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); +int coroutine_fn bdrv_co_is_allocated(BlockDriverState *bs, int64_t sector_num, + int nb_sectors, int *pnum); int bdrv_truncate(BlockDriverState *bs, int64_t offset); int64_t bdrv_getlength(BlockDriverState *bs); void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr); -- 1.7.7.6