Commit 8dd9006e authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Fam Zheng
Browse files

replication: pass BlockDriverState to reopen_backing_file 



This will be needed in the next patch to retrieve the AioContext.

Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <1477565348-5458-14-git-send-email-pbonzini@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent d16341fa

block/replication.c

+12 −9
Original line number Diff line number Diff line
@@ -322,9 +322,10 @@ static void secondary_do_checkpoint(BDRVReplicationState *s, Error **errp) 
    }

}



static void reopen_backing_file(BDRVReplicationState *s, bool writable,

static void reopen_backing_file(BlockDriverState *bs, bool writable,

                                Error **errp)

{

    BDRVReplicationState *s = bs->opaque;

    BlockReopenQueue *reopen_queue = NULL;

    int orig_hidden_flags, orig_secondary_flags;

    int new_hidden_flags, new_secondary_flags;
@@ -364,8 +365,9 @@ static void reopen_backing_file(BDRVReplicationState *s, bool writable, 
    }

}



static void backup_job_cleanup(BDRVReplicationState *s)

static void backup_job_cleanup(BlockDriverState *bs)

{

    BDRVReplicationState *s = bs->opaque;

    BlockDriverState *top_bs;



    top_bs = bdrv_lookup_bs(s->top_id, s->top_id, NULL);
@@ -374,19 +376,20 @@ static void backup_job_cleanup(BDRVReplicationState *s) 
    }

    bdrv_op_unblock_all(top_bs, s->blocker);

    error_free(s->blocker);

    reopen_backing_file(s, false, NULL);

    reopen_backing_file(bs, false, NULL);

}



static void backup_job_completed(void *opaque, int ret)

{

    BDRVReplicationState *s = opaque;

    BlockDriverState *bs = opaque;

    BDRVReplicationState *s = bs->opaque;



    if (s->replication_state != BLOCK_REPLICATION_FAILOVER) {

        /* The backup job is cancelled unexpectedly */

        s->error = -EIO;

    }



    backup_job_cleanup(s);

    backup_job_cleanup(bs);

}



static bool check_top_bs(BlockDriverState *top_bs, BlockDriverState *bs)
@@ -482,7 +485,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
        }



        /* reopen the backing file in r/w mode */

        reopen_backing_file(s, true, &local_err);

        reopen_backing_file(bs, true, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            aio_context_release(aio_context);
@@ -497,7 +500,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
        if (!top_bs || !bdrv_is_root_node(top_bs) ||

            !check_top_bs(top_bs, bs)) {

            error_setg(errp, "No top_bs or it is invalid");

            reopen_backing_file(s, false, NULL);

            reopen_backing_file(bs, false, NULL);

            aio_context_release(aio_context);

            return;

        }
@@ -507,10 +510,10 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode, 
        backup_start("replication-backup", s->secondary_disk->bs,

                     s->hidden_disk->bs, 0, MIRROR_SYNC_MODE_NONE, NULL, false,

                     BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,

                     backup_job_completed, s, NULL, &local_err);

                     backup_job_completed, bs, NULL, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            backup_job_cleanup(s);

            backup_job_cleanup(bs);

            aio_context_release(aio_context);

            return;

        }