Commit 2196b6f5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Wed 02 Dec 2015 15:45:36 GMT using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"

* remotes/cody/tags/block-pull-request:
  mirror: Quiesce source during "mirror_exit"

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 30a9fd5d 176c3699

block/mirror.c

+4 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ static void mirror_exit(BlockJob *job, void *opaque) 
    bdrv_unref(s->target);

    block_job_completed(&s->common, data->ret);

    g_free(data);

    bdrv_drained_end(src);

    bdrv_unref(src);

}
@@ -607,6 +608,9 @@ immediate_exit: 


    data = g_malloc(sizeof(*data));

    data->ret = ret;

    /* Before we switch to target in mirror_exit, make sure data doesn't

     * change. */

    bdrv_drained_begin(s->common.bs);

    block_job_defer_to_main_loop(&s->common, mirror_exit, data);

}