Commit 475df9d8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches

# gpg: Signature made Fri 09 Jun 2017 12:47:31 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:
  block: fix external snapshot abort permission error
  block/qcow.c: Fix memory leak in qcow_create()
  qemu-iotests: Test automatic commit job cancel on hot unplug
  commit: Fix use after free in completion
  qemu-iotests: Block migration test
  migration/block: Clean up BBs in block_save_complete()
  migration: Inactivate images after .save_live_complete_precopy()
  block: Fix anonymous BBs in blk_root_inactivate()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bbfa326f 719fc28c

block/block-backend.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int blk_root_inactivate(BdrvChild *child) 
     * this point because the VM is stopped) and unattached monitor-owned

     * BlockBackends. If there is still any other user like a block job, then

     * we simply can't inactivate the image. */

    if (!blk->dev && !blk->name[0]) {

    if (!blk->dev && !blk_name(blk)[0]) {

        return -EPERM;

    }

block/commit.c

+7 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ static void commit_complete(BlockJob *job, void *opaque) 
    int ret = data->ret;

    bool remove_commit_top_bs = false;



    /* Make sure overlay_bs and top stay around until bdrv_set_backing_hd() */

    bdrv_ref(top);

    bdrv_ref(overlay_bs);



    /* Remove base node parent that still uses BLK_PERM_WRITE/RESIZE before

     * the normal backing chain can be restored. */

    blk_unref(s->base);
@@ -124,6 +128,9 @@ static void commit_complete(BlockJob *job, void *opaque) 
    if (remove_commit_top_bs) {

        bdrv_set_backing_hd(overlay_bs, top, &error_abort);

    }



    bdrv_unref(overlay_bs);

    bdrv_unref(top);

}



static void coroutine_fn commit_run(void *opaque)

block/qcow.c

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
            header_size += backing_filename_len;

        } else {

            /* special backing file for vvfat */

            g_free(backing_file);

            backing_file = NULL;

        }

        header.cluster_bits = 9; /* 512 byte cluster to avoid copying

blockdev.c

+4 −0
Original line number Diff line number Diff line
@@ -1803,7 +1803,11 @@ static void external_snapshot_abort(BlkActionState *common) 
                             DO_UPCAST(ExternalSnapshotState, common, common);

    if (state->new_bs) {

        if (state->overlay_appended) {

            bdrv_ref(state->old_bs);   /* we can't let bdrv_set_backind_hd()

                                          close state->old_bs; we need it */

            bdrv_set_backing_hd(state->new_bs, NULL, &error_abort);

            bdrv_replace_node(state->new_bs, state->old_bs, &error_abort);

            bdrv_unref(state->old_bs); /* bdrv_replace_node() ref'ed old_bs */

        }

    }

}

migration/block.c

+17 −5
Original line number Diff line number Diff line
@@ -674,16 +674,14 @@ static int64_t get_remaining_dirty(void) 
    return dirty << BDRV_SECTOR_BITS;

}



/* Called with iothread lock taken.  */



static void block_migration_cleanup(void *opaque)



/* Called with iothread lock taken.  */

static void block_migration_cleanup_bmds(void)

{

    BlkMigDevState *bmds;

    BlkMigBlock *blk;

    AioContext *ctx;



    bdrv_drain_all();



    unset_dirty_tracking();



    while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {
@@ -701,6 +699,16 @@ static void block_migration_cleanup(void *opaque) 
        g_free(bmds->aio_bitmap);

        g_free(bmds);

    }

}



/* Called with iothread lock taken.  */

static void block_migration_cleanup(void *opaque)

{

    BlkMigBlock *blk;



    bdrv_drain_all();



    block_migration_cleanup_bmds();



    blk_mig_lock();

    while ((blk = QSIMPLEQ_FIRST(&block_mig_state.blk_list)) != NULL) {
@@ -844,6 +852,10 @@ static int block_save_complete(QEMUFile *f, void *opaque) 


    qemu_put_be64(f, BLK_MIG_FLAG_EOS);



    /* Make sure that our BlockBackends are gone, so that the block driver

     * nodes can be inactivated. */

    block_migration_cleanup_bmds();



    return 0;

}