From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdzTm-0002B5-CH for qemu-devel@nongnu.org; Fri, 03 Apr 2015 07:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdzTl-0005It-2i for qemu-devel@nongnu.org; Fri, 03 Apr 2015 07:09:38 -0400 Message-ID: <551E74DB.7080801@redhat.com> Date: Fri, 03 Apr 2015 13:09:15 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1428055280-12015-1-git-send-email-wency@cn.fujitsu.com> <1428055280-12015-12-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1428055280-12015-12-git-send-email-wency@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH COLO v3 11/14] Backup: clear all bitmap when doing block checkpoint List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wen Congyang , qemu devel , Fam Zheng , Max Reitz Cc: Kevin Wolf , Lai Jiangshan , qemu block , Jeff Cody , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Stefan Hajnoczi , Yang Hongyang , zhanghailiang On 03/04/2015 12:01, Wen Congyang wrote: > Signed-off-by: Wen Congyang > Signed-off-by: zhanghailiang > Signed-off-by: Gonglei > Cc: Jeff Cody > --- > block/backup.c | 13 +++++++++++++ > blockjob.c | 10 ++++++++++ > include/block/blockjob.h | 12 ++++++++++++ > 3 files changed, 35 insertions(+) > > diff --git a/block/backup.c b/block/backup.c > index 1c535b1..e8b8931 100644 > --- a/block/backup.c > +++ b/block/backup.c > @@ -208,11 +208,24 @@ static void backup_iostatus_reset(BlockJob *job) > bdrv_iostatus_reset(s->target); > } > > +static void backup_do_checkpoint(BlockJob *job, Error **errp) > +{ > + BackupBlockJob *backup_job = container_of(job, BackupBlockJob, common); > + > + if (backup_job->sync_mode != MIRROR_SYNC_MODE_NONE) { > + error_setg(errp, "this feature or command is not currently supported"); > + return; > + } > + > + hbitmap_reset_all(backup_job->bitmap); > +} > + > static const BlockJobDriver backup_job_driver = { > .instance_size = sizeof(BackupBlockJob), > .job_type = BLOCK_JOB_TYPE_BACKUP, > .set_speed = backup_set_speed, > .iostatus_reset = backup_iostatus_reset, > + .do_checkpoint = backup_do_checkpoint, > }; > > static BlockErrorAction backup_error_action(BackupBlockJob *job, > diff --git a/blockjob.c b/blockjob.c > index ba2255d..dbac81e 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -388,3 +388,13 @@ void block_job_defer_to_main_loop(BlockJob *job, > > qemu_bh_schedule(data->bh); > } > + > +void block_job_do_checkpoint(BlockJob *job, Error **errp) > +{ > + if (!job->driver->do_checkpoint) { > + error_setg(errp, "this feature or command is not currently supported"); > + return; > + } > + > + job->driver->do_checkpoint(job, errp); > +} > diff --git a/include/block/blockjob.h b/include/block/blockjob.h > index b6d4ebb..c6f1cad 100644 > --- a/include/block/blockjob.h > +++ b/include/block/blockjob.h > @@ -50,6 +50,9 @@ typedef struct BlockJobDriver { > * manually. > */ > void (*complete)(BlockJob *job, Error **errp); > + > + /** Optional callback for job types that support checkpoint. */ > + void (*do_checkpoint)(BlockJob *job, Error **errp); > } BlockJobDriver; > > /** > @@ -334,4 +337,13 @@ void block_job_defer_to_main_loop(BlockJob *job, > BlockJobDeferToMainLoopFn *fn, > void *opaque); > > +/** > + * block_job_do_checkpoint: > + * @job: The job. > + * @errp: Error object. > + * > + * Do block checkpoint on the specified job. > + */ > +void block_job_do_checkpoint(BlockJob *job, Error **errp); > + > #endif > Does this only run on the secondary, or also on the primary? What happens if you use a block job on the primary? Perhaps a variant of backup_job_driver is needed for COLO, and the default behavior of block_job_do_checkpoint should be to do nothing? Paolo