From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zuk0V-0000rO-PL for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zuk0T-0001mc-1z for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:36:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zuk0S-0001mG-Qa for qemu-devel@nongnu.org; Fri, 06 Nov 2015 11:36:52 -0500 Date: Fri, 6 Nov 2015 16:36:47 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20151106163646.GE4267@work-vm> References: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com> <1446551816-15768-4-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1446551816-15768-4-git-send-email-zhang.zhanghailiang@huawei.com> Subject: Re: [Qemu-devel] [PATCH COLO-Frame v10 03/38] COLO: migrate colo related info to secondary node List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, qemu-devel@nongnu.org, arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com * zhanghailiang (zhang.zhanghailiang@huawei.com) wrote: > We can know if VM in destination should go into COLO mode by refer to > the info that been migrated from PVM. > > We skip this section if colo is not enabled (i.e. > migrate_set_capability colo off), so that, It not break compatibility with migration > however the --enable-colo/disable-colo on the source/destination; > > Signed-off-by: zhanghailiang > Signed-off-by: Li Zhijian > Signed-off-by: Gonglei Reviewed-by: Dr. David Alan Gilbert > --- > v10: > - Use VMSTATE_BOOL instead of VMSTATE_UNIT32 for 'colo_requested' (Dave's suggestion). > --- > include/migration/colo.h | 2 ++ > migration/Makefile.objs | 1 + > migration/colo-comm.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ > vl.c | 3 ++- > 4 files changed, 55 insertions(+), 1 deletion(-) > create mode 100644 migration/colo-comm.c > > diff --git a/include/migration/colo.h b/include/migration/colo.h > index c60a590..9b6662d 100644 > --- a/include/migration/colo.h > +++ b/include/migration/colo.h > @@ -14,7 +14,9 @@ > #define QEMU_COLO_H > > #include "qemu-common.h" > +#include "migration/migration.h" > > bool colo_supported(void); > +void colo_info_mig_init(void); > > #endif > diff --git a/migration/Makefile.objs b/migration/Makefile.objs > index 5a25d39..cb7bd30 100644 > --- a/migration/Makefile.objs > +++ b/migration/Makefile.objs > @@ -1,5 +1,6 @@ > common-obj-y += migration.o tcp.o > common-obj-$(CONFIG_COLO) += colo.o > +common-obj-y += colo-comm.o > common-obj-y += vmstate.o > common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o > common-obj-y += xbzrle.o > diff --git a/migration/colo-comm.c b/migration/colo-comm.c > new file mode 100644 > index 0000000..fb407e0 > --- /dev/null > +++ b/migration/colo-comm.c > @@ -0,0 +1,50 @@ > +/* > + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) > + * (a.k.a. Fault Tolerance or Continuous Replication) > + * > + * Copyright (c) 2015 HUAWEI TECHNOLOGIES CO., LTD. > + * Copyright (c) 2015 FUJITSU LIMITED > + * Copyright (c) 2015 Intel Corporation > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > + * > + */ > + > +#include > +#include "trace.h" > + > +typedef struct { > + bool colo_requested; > +} COLOInfo; > + > +static COLOInfo colo_info; > + > +static void colo_info_pre_save(void *opaque) > +{ > + COLOInfo *s = opaque; > + > + s->colo_requested = migrate_colo_enabled(); > +} > + > +static bool colo_info_need(void *opaque) > +{ > + return migrate_colo_enabled(); > +} > + > +static const VMStateDescription colo_state = { > + .name = "COLOState", > + .version_id = 1, > + .minimum_version_id = 1, > + .pre_save = colo_info_pre_save, > + .needed = colo_info_need, > + .fields = (VMStateField[]) { > + VMSTATE_BOOL(colo_requested, COLOInfo), > + VMSTATE_END_OF_LIST() > + }, > +}; > + > +void colo_info_mig_init(void) > +{ > + vmstate_register(NULL, 0, &colo_state, &colo_info); > +} > diff --git a/vl.c b/vl.c > index f5f7c3f..10e6cbe 100644 > --- a/vl.c > +++ b/vl.c > @@ -91,6 +91,7 @@ int main(int argc, char **argv) > #include "sysemu/dma.h" > #include "audio/audio.h" > #include "migration/migration.h" > +#include "migration/colo.h" > #include "sysemu/kvm.h" > #include "qapi/qmp/qjson.h" > #include "qemu/option.h" > @@ -4421,7 +4422,7 @@ int main(int argc, char **argv, char **envp) > > blk_mig_init(); > ram_mig_init(); > - > + colo_info_mig_init(); > /* If the currently selected machine wishes to override the units-per-bus > * property of its default HBA interface type, do so now. */ > if (machine_class->units_per_default_bus) { > -- > 1.8.3.1 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK