Commit 50104f5a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block layer patches for 2.10.0-rc0

# gpg: Signature made Mon 24 Jul 2017 15:16:42 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: Avoid unnecessary sleeps
  block: Skip implicit nodes in query-block/blockstats
  qcow2: Fix sector calculation in qcow2_measure()
  dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented
  iotests: Remove a few tests from 'quick' group

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ce1d20aa 2c93c5cb

block.c

+0 −13
Original line number Diff line number Diff line
@@ -3973,19 +3973,6 @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs, 
    return retval;

}



int bdrv_get_backing_file_depth(BlockDriverState *bs)

{

    if (!bs->drv) {

        return 0;

    }



    if (!bs->backing) {

        return 0;

    }



    return 1 + bdrv_get_backing_file_depth(bs->backing->bs);

}



void bdrv_init(void)

{

    module_call_init(MODULE_INIT_BLOCK);

block/commit.c

+3 −0
Original line number Diff line number Diff line
@@ -346,6 +346,9 @@ void commit_start(const char *job_id, BlockDriverState *bs, 
    if (commit_top_bs == NULL) {

        goto fail;

    }

    if (!filter_node_name) {

        commit_top_bs->implicit = true;

    }

    commit_top_bs->total_sectors = top->total_sectors;

    bdrv_set_aio_context(commit_top_bs, bdrv_get_aio_context(top));

block/dirty-bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ BlockDirtyInfoList *bdrv_query_dirty_bitmaps(BlockDriverState *bs) 
    QLIST_FOREACH(bm, &bs->dirty_bitmaps, list) {

        BlockDirtyInfo *info = g_new0(BlockDirtyInfo, 1);

        BlockDirtyInfoList *entry = g_new0(BlockDirtyInfoList, 1);

        info->count = bdrv_get_dirty_count(bm);

        info->count = bdrv_get_dirty_count(bm) << BDRV_SECTOR_BITS;

        info->granularity = bdrv_dirty_bitmap_granularity(bm);

        info->has_name = !!bm->name;

        info->name = g_strdup(bm->name);

block/mirror.c

+3 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,9 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, 
    if (mirror_top_bs == NULL) {

        return;

    }

    if (!filter_node_name) {

        mirror_top_bs->implicit = true;

    }

    mirror_top_bs->total_sectors = bs->total_sectors;

    bdrv_set_aio_context(mirror_top_bs, bdrv_get_aio_context(bs));

block/qapi.c

+27 −6
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, 
        info->backing_file = g_strdup(bs->backing_file);

    }



    info->backing_file_depth = bdrv_get_backing_file_depth(bs);

    info->detect_zeroes = bs->detect_zeroes;



    if (blk && blk_get_public(blk)->throttle_state) {
@@ -125,6 +124,7 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, 


    bs0 = bs;

    p_image_info = &info->image;

    info->backing_file_depth = 0;

    while (1) {

        Error *local_err = NULL;

        bdrv_query_image_info(bs0, p_image_info, &local_err);
@@ -133,13 +133,21 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, 
            qapi_free_BlockDeviceInfo(info);

            return NULL;

        }



        if (bs0->drv && bs0->backing) {

            info->backing_file_depth++;

            bs0 = bs0->backing->bs;

            (*p_image_info)->has_backing_image = true;

            p_image_info = &((*p_image_info)->backing_image);

        } else {

            break;

        }



        /* Skip automatically inserted nodes that the user isn't aware of for

         * query-block (blk != NULL), but not for query-named-block-nodes */

        while (blk && bs0 && bs0->drv && bs0->implicit) {

            bs0 = backing_bs(bs0);

        }

    }



    return info;
@@ -324,6 +332,11 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, 
    BlockDriverState *bs = blk_bs(blk);

    char *qdev;



    /* Skip automatically inserted nodes that the user isn't aware of */

    while (bs && bs->drv && bs->implicit) {

        bs = backing_bs(bs);

    }



    info->device = g_strdup(blk_name(blk));

    info->type = g_strdup("unknown");

    info->locked = blk_dev_is_medium_locked(blk);
@@ -434,8 +447,8 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) 
    }

}



static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs,

                                 bool query_backing)

static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs,

                                        bool blk_level)

{

    BlockStats *s = NULL;
@@ -446,6 +459,14 @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, 
        return s;

    }



    /* Skip automatically inserted nodes that the user isn't aware of in

     * a BlockBackend-level command. Stay at the exact node for a node-level

     * command. */

    while (blk_level && bs->drv && bs->implicit) {

        bs = backing_bs(bs);

        assert(bs);

    }



    if (bdrv_get_node_name(bs)[0]) {

        s->has_node_name = true;

        s->node_name = g_strdup(bdrv_get_node_name(bs));
@@ -455,12 +476,12 @@ static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, 


    if (bs->file) {

        s->has_parent = true;

        s->parent = bdrv_query_bds_stats(bs->file->bs, query_backing);

        s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);

    }



    if (query_backing && bs->backing) {

    if (blk_level && bs->backing) {

        s->has_backing = true;

        s->backing = bdrv_query_bds_stats(bs->backing->bs, query_backing);

        s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level);

    }



    return s;