Commit ff770b07 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 Thu 01 Oct 2015 20:02:33 BST 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:
  block: mirror - fix full sync mode when target does not support zero init

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5250ced8 5279efeb

block/mirror.c

+3 −1
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ static void coroutine_fn mirror_run(void *opaque) 
    if (!s->is_none_mode) {

        /* First part, loop on the sectors and initialize the dirty bitmap.  */

        BlockDriverState *base = s->base;

        bool mark_all_dirty = s->base == NULL && !bdrv_has_zero_init(s->target);



        for (sector_num = 0; sector_num < end; ) {

            /* Just to make sure we are not exceeding int limit. */

            int nb_sectors = MIN(INT_MAX >> BDRV_SECTOR_BITS,
@@ -477,7 +479,7 @@ static void coroutine_fn mirror_run(void *opaque) 
            }



            assert(n > 0);

            if (ret == 1) {

            if (ret == 1 || mark_all_dirty) {

                bdrv_set_dirty_bitmap(s->dirty_bitmap, sector_num, n);

            }

            sector_num += n;