Commit 2ad728bd authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qmp/queue/qmp' into staging 

* qmp/queue/qmp:
  hmp: show the backing file depth
  block: Use bdrv_get_backing_file_depth()
  block: create bdrv_get_backing_file_depth()
  qapi: qapi.py: allow the "'" character to be escaped
parents 9c936c86 75115d95

block.c

+16 −0
Original line number Diff line number Diff line
@@ -2450,6 +2450,9 @@ BlockInfoList *qmp_query_block(Error **errp) 
                info->value->inserted->backing_file = g_strdup(bs->backing_file);

            }



            info->value->inserted->backing_file_depth =

                bdrv_get_backing_file_depth(bs);



            if (bs->io_limits_enabled) {

                info->value->inserted->bps =

                               bs->io_limits.bps[BLOCK_IO_LIMIT_TOTAL];
@@ -2754,6 +2757,19 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, 
    return NULL;

}



int bdrv_get_backing_file_depth(BlockDriverState *bs)

{

    if (!bs->drv) {

        return 0;

    }



    if (!bs->backing_hd) {

        return 0;

    }



    return 1 + bdrv_get_backing_file_depth(bs->backing_hd);

}



#define NB_SUFFIXES 4



char *get_human_readable_size(char *buf, int buf_size, int64_t size)

block.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ int coroutine_fn bdrv_co_is_allocated_above(BlockDriverState *top, 
                                            int nb_sectors, int *pnum);

BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,

    const char *backing_file);

int bdrv_get_backing_file_depth(BlockDriverState *bs);

int bdrv_truncate(BlockDriverState *bs, int64_t offset);

int64_t bdrv_getlength(BlockDriverState *bs);

int64_t bdrv_get_allocated_file_size(BlockDriverState *bs);

hmp.c

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ void hmp_info_block(Monitor *mon) 
            if (info->value->inserted->has_backing_file) {

                monitor_printf(mon, " backing_file=");

                monitor_print_filename(mon, info->value->inserted->backing_file);

                monitor_printf(mon, " backing_file_depth=%" PRId64,

                    info->value->inserted->backing_file_depth);

            }

            monitor_printf(mon, " ro=%d drv=%s encrypted=%d",

                           info->value->inserted->ro,

qapi-schema.json

+6 −3
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ 
#

# @backing_file: #optional the name of the backing file (for copy-on-write)

#

# @backing_file_depth: number of files in the backing file chain (since: 1.2)

#

# @encrypted: true if the backing device is encrypted

#

# @bps: total throughput limit in bytes per second is specified
@@ -418,9 +420,10 @@ 
##

{ 'type': 'BlockDeviceInfo',

  'data': { 'file': 'str', 'ro': 'bool', 'drv': 'str',

            '*backing_file': 'str', 'encrypted': 'bool',

            'bps': 'int', 'bps_rd': 'int', 'bps_wr': 'int',

            'iops': 'int', 'iops_rd': 'int', 'iops_wr': 'int'} }

            '*backing_file': 'str', 'backing_file_depth': 'int',

            'encrypted': 'bool', 'bps': 'int', 'bps_rd': 'int',

            'bps_wr': 'int', 'iops': 'int', 'iops_rd': 'int',

            'iops_wr': 'int'} }



##

# @BlockDeviceIoStatus:

qmp-commands.hx

+2 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ Each json-object contain the following: 
                                "nbd", "parallels", "qcow", "qcow2", "raw",

                                "tftp", "vdi", "vmdk", "vpc", "vvfat"

         - "backing_file": backing file name (json-string, optional)

         - "backing_file_depth": number of files in the backing file chain (json-int)

         - "encrypted": true if encrypted, false otherwise (json-bool)

         - "bps": limit total bytes per second (json-int)

         - "bps_rd": limit read bytes per second (json-int)
@@ -1345,6 +1346,7 @@ Example: 
               "drv":"qcow2",

               "encrypted":false,

               "file":"disks/test.img",

               "backing_file_depth":0,

               "bps":1000000,

               "bps_rd":0,

               "bps_wr":0,