From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zhgoc-00087A-75 for qemu-devel@nongnu.org; Thu, 01 Oct 2015 12:34:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zhgob-0005AW-BP for qemu-devel@nongnu.org; Thu, 01 Oct 2015 12:34:42 -0400 From: John Snow Date: Thu, 1 Oct 2015 12:34:32 -0400 Message-Id: <1443717273-5280-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1443717273-5280-1-git-send-email-jsnow@redhat.com> References: <1443717273-5280-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] block/mirror: allow migration after sync List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, John Snow After the mirroring blockjob reaches synchronization, allow migration to resume. Signed-off-by: John Snow --- block/mirror.c | 2 ++ blockjob.c | 5 +++++ include/block/blockjob.h | 8 ++++++++ 3 files changed, 15 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index a258926..5eb469a 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -415,6 +415,7 @@ static void coroutine_fn mirror_run(void *opaque) /* Report BLOCK_JOB_READY and wait for complete. */ block_job_event_ready(&s->common); s->synced = true; + block_job_allow_migration(&s->common); while (!block_job_is_cancelled(&s->common) && !s->should_complete) { block_job_yield(&s->common); } @@ -540,6 +541,7 @@ static void coroutine_fn mirror_run(void *opaque) if (!s->synced) { block_job_event_ready(&s->common); s->synced = true; + block_job_allow_migration(&s->common); } should_complete = s->should_complete || diff --git a/blockjob.c b/blockjob.c index b5849b3..bcb4fca 100644 --- a/blockjob.c +++ b/blockjob.c @@ -95,6 +95,11 @@ void block_job_release(BlockDriverState *bs) g_free(job); } +void block_job_allow_migration(BlockJob *job) +{ + migrate_del_blocker(job->blocker); +} + void block_job_completed(BlockJob *job, int ret) { BlockDriverState *bs = job->bs; diff --git a/include/block/blockjob.h b/include/block/blockjob.h index dd9d5e6..2278484 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -147,6 +147,14 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, void *opaque, Error **errp); /** + * block_job_allow_migration: + * @job: The job to modify to lift its restriction on migrations. + * + * Lift this job's restriction on prohibiting outgoing migrations. + */ +void block_job_allow_migration(BlockJob *job); + +/** * block_job_sleep_ns: * @job: The job that calls the function. * @clock: The clock to sleep on. -- 2.4.3