Commit bffe88d1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- Introduce real BdrvChildRole
- blk/bdrv_make_empty() functions instead of calling callbacks directly
- mirror: Make sure that source and target size match
- block-copy: Fix uninitialized variable
- block/replication: Avoid cancelling the job twice
- ahci: Log lost IRQs
- iotests: Run pylint and mypy in a testcase
- iotests: log messages from notrun()

# gpg: Signature made Mon 18 May 2020 18:05:32 BST
# gpg:                using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg:                issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (52 commits)
  hw: Use QEMU_IS_ALIGNED() on parallel flash block size
  iotests/030: Reduce run time by unthrottling job earlier
  hw/ide/ahci: Log lost IRQs
  iotests: log messages from notrun()
  block/block-copy: Simplify block_copy_do_copy()
  block/block-copy: Fix uninitialized variable in block_copy_task_entry
  block: Drop @child_class from bdrv_child_perm()
  block: Pass BdrvChildRole in remaining cases
  block: Drop child_file
  block: Drop bdrv_format_default_perms()
  block: Make bdrv_filter_default_perms() static
  block: Use bdrv_default_perms()
  tests: Use child_of_bds instead of child_file
  block: Use child_of_bds in remaining places
  block: Make filter drivers use child_of_bds
  block: Make format drivers use child_of_bds
  block: Drop child_backing
  block: Make backing files child_of_bds children
  block: Drop child_format
  block: Switch child_format users to child_of_bds
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a89af8c2 4cdd0a77

block.c

+375 −226

File changed.

Preview size limit exceeded, changes collapsed.

block/backup-top.c

+6 −5
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void backup_top_refresh_filename(BlockDriverState *bs) 
}



static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c,

                                  const BdrvChildRole *role,

                                  BdrvChildRole role,

                                  BlockReopenQueue *reopen_queue,

                                  uint64_t perm, uint64_t shared,

                                  uint64_t *nperm, uint64_t *nshared)
@@ -142,7 +142,7 @@ static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, 
        return;

    }



    if (role == &child_file) {

    if (!(role & BDRV_CHILD_FILTERED)) {

        /*

         * Target child

         *
@@ -155,8 +155,8 @@ static void backup_top_child_perm(BlockDriverState *bs, BdrvChild *c, 
        *nperm = BLK_PERM_WRITE;

    } else {

        /* Source child */

        bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,

                                  nperm, nshared);

        bdrv_default_perms(bs, c, role, reopen_queue,

                           perm, shared, nperm, nshared);



        if (perm & BLK_PERM_WRITE) {

            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
@@ -214,7 +214,8 @@ BlockDriverState *bdrv_backup_top_append(BlockDriverState *source, 
             source->supported_zero_flags);



    bdrv_ref(target);

    state->target = bdrv_attach_child(top, target, "target", &child_file, errp);

    state->target = bdrv_attach_child(top, target, "target", &child_of_bds,

                                      BDRV_CHILD_DATA, errp);

    if (!state->target) {

        bdrv_unref(target);

        bdrv_unref(top);

block/blkdebug.c

+6 −4
Original line number Diff line number Diff line
@@ -497,7 +497,9 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 


    /* Open the image file */

    bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image",

                               bs, &child_file, false, &local_err);

                               bs, &child_of_bds,

                               BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

                               false, &local_err);

    if (local_err) {

        ret = -EINVAL;

        error_propagate(errp, local_err);
@@ -993,15 +995,15 @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state, 
}



static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c,

                                const BdrvChildRole *role,

                                BdrvChildRole role,

                                BlockReopenQueue *reopen_queue,

                                uint64_t perm, uint64_t shared,

                                uint64_t *nperm, uint64_t *nshared)

{

    BDRVBlkdebugState *s = bs->opaque;



    bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared,

                              nperm, nshared);

    bdrv_default_perms(bs, c, role, reopen_queue,

                       perm, shared, nperm, nshared);



    *nperm |= s->take_child_perms;

    *nshared &= ~s->unshare_child_perms;

block/blklogwrites.c

+7 −9
Original line number Diff line number Diff line
@@ -157,7 +157,8 @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    /* Open the file */

    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false,

    bs->file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,

                               BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY, false,

                               &local_err);

    if (local_err) {

        ret = -EINVAL;
@@ -166,8 +167,8 @@ static int blk_log_writes_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    /* Open the log file */

    s->log_file = bdrv_open_child(NULL, options, "log", bs, &child_file, false,

                                  &local_err);

    s->log_file = bdrv_open_child(NULL, options, "log", bs, &child_of_bds,

                                  BDRV_CHILD_METADATA, false, &local_err);

    if (local_err) {

        ret = -EINVAL;

        error_propagate(errp, local_err);
@@ -282,7 +283,7 @@ static int64_t blk_log_writes_getlength(BlockDriverState *bs) 
}



static void blk_log_writes_child_perm(BlockDriverState *bs, BdrvChild *c,

                                      const BdrvChildRole *role,

                                      BdrvChildRole role,

                                      BlockReopenQueue *ro_q,

                                      uint64_t perm, uint64_t shrd,

                                      uint64_t *nperm, uint64_t *nshrd)
@@ -293,11 +294,8 @@ static void blk_log_writes_child_perm(BlockDriverState *bs, BdrvChild *c, 
        return;

    }



    if (!strcmp(c->name, "log")) {

        bdrv_format_default_perms(bs, c, role, ro_q, perm, shrd, nperm, nshrd);

    } else {

        bdrv_filter_default_perms(bs, c, role, ro_q, perm, shrd, nperm, nshrd);

    }

    bdrv_default_perms(bs, c, role, ro_q, perm, shrd,

                       nperm, nshrd);

}



static void blk_log_writes_refresh_limits(BlockDriverState *bs, Error **errp)

block/blkreplay.c

+5 −3
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags, 
    int ret;



    /* Open the image file */

    bs->file = bdrv_open_child(NULL, options, "image",

                               bs, &child_file, false, &local_err);

    bs->file = bdrv_open_child(NULL, options, "image", bs, &child_of_bds,

                               BDRV_CHILD_FILTERED | BDRV_CHILD_PRIMARY,

                               false, &local_err);

    if (local_err) {

        ret = -EINVAL;

        error_propagate(errp, local_err);
@@ -135,9 +136,10 @@ static int blkreplay_snapshot_goto(BlockDriverState *bs, 
static BlockDriver bdrv_blkreplay = {

    .format_name            = "blkreplay",

    .instance_size          = 0,

    .is_filter              = true,



    .bdrv_open              = blkreplay_open,

    .bdrv_child_perm        = bdrv_filter_default_perms,

    .bdrv_child_perm        = bdrv_default_perms,

    .bdrv_getlength         = blkreplay_getlength,



    .bdrv_co_preadv         = blkreplay_co_preadv,