Patchwork sheepdog: implement .bdrv_get_allocated_file_size

login
register
mail settings
Submitter namei.unix@gmail.com
Date Aug. 7, 2013, 8:59 a.m.
Message ID <1375865993-6715-1-git-send-email-namei.unix@gmail.com>
Download mbox | patch
Permalink /patch/265414/
State New
Headers show

Comments

namei.unix@gmail.com - Aug. 7, 2013, 8:59 a.m.
With this patch, qemu-img info sheepdog:image will show disk size for sheepdog
images.

Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Liu Yuan <namei.unix@gmail.com>
---
 block/sheepdog.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
MORITA Kazutaka - Aug. 7, 2013, 11:14 p.m.
At Wed,  7 Aug 2013 16:59:53 +0800,
Liu Yuan wrote:
> 
> With this patch, qemu-img info sheepdog:image will show disk size for sheepdog
> images.
> 
> Cc: Kevin Wolf <kwolf@redhat.com>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
> Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> ---
>  block/sheepdog.c |   19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)

Looks good to me.

Reviewed-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Kevin Wolf - Aug. 8, 2013, 10:48 a.m.
Am 08.08.2013 um 01:14 hat MORITA Kazutaka geschrieben:
> At Wed,  7 Aug 2013 16:59:53 +0800,
> Liu Yuan wrote:
> > 
> > With this patch, qemu-img info sheepdog:image will show disk size for sheepdog
> > images.
> > 
> > Cc: Kevin Wolf <kwolf@redhat.com>
> > Cc: Stefan Hajnoczi <stefanha@redhat.com>
> > Cc: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
> > Signed-off-by: Liu Yuan <namei.unix@gmail.com>
> > ---
> >  block/sheepdog.c |   19 +++++++++++++++++++
> >  1 file changed, 19 insertions(+)
> 
> Looks good to me.
> 
> Reviewed-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>

Thanks, applied to block-next (for 1.7)

Kevin

Patch

diff --git a/block/sheepdog.c b/block/sheepdog.c
index afe0533..7699aad 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2321,6 +2321,22 @@  sd_co_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
     return ret;
 }
 
+static int64_t sd_get_allocated_file_size(BlockDriverState *bs)
+{
+    BDRVSheepdogState *s = bs->opaque;
+    SheepdogInode *inode = &s->inode;
+    unsigned long i, last = DIV_ROUND_UP(inode->vdi_size, SD_DATA_OBJ_SIZE);
+    uint64_t size = 0;
+
+    for (i = 0; i < last; i++) {
+        if (inode->data_vdi_id[i] == 0) {
+            continue;
+        }
+        size += SD_DATA_OBJ_SIZE;
+    }
+    return size;
+}
+
 static QEMUOptionParameter sd_create_options[] = {
     {
         .name = BLOCK_OPT_SIZE,
@@ -2349,6 +2365,7 @@  static BlockDriver bdrv_sheepdog = {
     .bdrv_create    = sd_create,
     .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_getlength = sd_getlength,
+    .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
     .bdrv_truncate  = sd_truncate,
 
     .bdrv_co_readv  = sd_co_readv,
@@ -2377,6 +2394,7 @@  static BlockDriver bdrv_sheepdog_tcp = {
     .bdrv_create    = sd_create,
     .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_getlength = sd_getlength,
+    .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
     .bdrv_truncate  = sd_truncate,
 
     .bdrv_co_readv  = sd_co_readv,
@@ -2405,6 +2423,7 @@  static BlockDriver bdrv_sheepdog_unix = {
     .bdrv_create    = sd_create,
     .bdrv_has_zero_init = bdrv_has_zero_init_1,
     .bdrv_getlength = sd_getlength,
+    .bdrv_get_allocated_file_size = sd_get_allocated_file_size,
     .bdrv_truncate  = sd_truncate,
 
     .bdrv_co_readv  = sd_co_readv,