From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5D6R-0002Ia-Mw for qemu-devel@nongnu.org; Wed, 07 Mar 2012 04:24:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5D6P-0000ub-Fz for qemu-devel@nongnu.org; Wed, 07 Mar 2012 04:24:11 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:53385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5D6O-0000sC-Sr for qemu-devel@nongnu.org; Wed, 07 Mar 2012 04:24:09 -0500 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2012 10:14:24 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q279I36T2932916 for ; Wed, 7 Mar 2012 20:18:04 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q279NhNw000457 for ; Wed, 7 Mar 2012 20:23:43 +1100 From: Dong Xu Wang Date: Wed, 7 Mar 2012 17:22:56 +0800 Message-Id: <1331112179-12726-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/4] block: add image fragmentation statistics to qemu-img List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang , stefanha@linux.vnet.ibm.com From: Dong Xu Wang Discussion can be found at: http://patchwork.ozlabs.org/patch/128730/ This patch add image fragmentation statistics while using qemu-img info. Signed-off-by: Dong Xu Wang --- block.c | 13 +++++++++++++ block.h | 7 +++++++ block_int.h | 1 + qemu-img.c | 9 +++++++++ 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 52ffe14..947607b 100644 --- a/block.c +++ b/block.c @@ -2588,6 +2588,19 @@ int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return drv->bdrv_get_info(bs, bdi); } +int bdrv_get_fragment(BlockDriverState *bs, BlockFragInfo *bfi) +{ + BlockDriver *drv = bs->drv; + if (!drv) { + return -ENOMEDIUM; + } + if (!drv->bdrv_get_fragment) { + return -ENOTSUP; + } + memset(bfi, 0, sizeof(*bfi)); + return drv->bdrv_get_fragment(bs, bfi); +} + int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf, int64_t pos, int size) { diff --git a/block.h b/block.h index 48d0bf3..d76d386 100644 --- a/block.h +++ b/block.h @@ -17,6 +17,12 @@ typedef struct BlockDriverInfo { int64_t vm_state_offset; } BlockDriverInfo; +typedef struct BlockFragInfo { + uint64_t allocated_clusters; + uint64_t total_clusters; + uint64_t fragmented_clusters; +} BlockFragInfo; + typedef struct QEMUSnapshotInfo { char id_str[128]; /* unique snapshot id */ /* the following fields are informative. They are not needed for @@ -290,6 +296,7 @@ const char *bdrv_get_device_name(BlockDriverState *bs); int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); +int bdrv_get_fragment(BlockDriverState *bs, BlockFragInfo *bfi); const char *bdrv_get_encrypted_filename(BlockDriverState *bs); void bdrv_get_backing_filename(BlockDriverState *bs, diff --git a/block_int.h b/block_int.h index b460c36..339a5ac 100644 --- a/block_int.h +++ b/block_int.h @@ -179,6 +179,7 @@ struct BlockDriver { int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs, const char *snapshot_name); int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); + int (*bdrv_get_fragment)(BlockDriverState *bs, BlockFragInfo *bdi); int (*bdrv_save_vmstate)(BlockDriverState *bs, const uint8_t *buf, int64_t pos, int size); diff --git a/qemu-img.c b/qemu-img.c index 8df3564..17731a9 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1075,6 +1075,7 @@ static int img_info(int argc, char **argv) char backing_filename[1024]; char backing_filename2[1024]; BlockDriverInfo bdi; + BlockFragInfo bfi; fmt = NULL; for(;;) { @@ -1126,6 +1127,14 @@ static int img_info(int argc, char **argv) printf("cluster_size: %d\n", bdi.cluster_size); } } + if (bdrv_get_fragment(bs, &bfi) >= 0) { + if (bfi.total_clusters != 0 && bfi.allocated_clusters != 0) { + printf("%lld/%lld = %0.2f%% allocated, %0.2f%% fragmented\n", + bfi.allocated_clusters, bfi.total_clusters, + bfi.allocated_clusters * 100.0 / bfi.total_clusters, + bfi.fragmented_clusters * 100.0 / bfi.allocated_clusters); + } + } bdrv_get_backing_filename(bs, backing_filename, sizeof(backing_filename)); if (backing_filename[0] != '\0') { path_combine(backing_filename2, sizeof(backing_filename2), -- 1.7.5.4