| Message ID | 1411464235-5653-4-git-send-email-yanghy@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 09/23/2014 03:23 AM, Yang Hongyang wrote: > introduce an api colo_supported() to indicate COLO support, returns > true if colo supported (configured with --enable-colo). > > Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> > --- > +++ b/include/migration/migration-colo.h > @@ -0,0 +1,18 @@ > +/* > + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) > + * (a.k.a. Fault Tolerance or Continuous Replication) > + * > + * Copyright (C) 2014 FUJITSU LIMITED > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory. Is there any reason you are forbidding the use of this file in a GPLv3 project? We prefer new files to be GPLv2+, not GPLv2-only (by the use of the "or later" clause), unless there is strong reason why it is not possible. > +++ b/migration-colo.c > @@ -0,0 +1,16 @@ > +/* > + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) > + * (a.k.a. Fault Tolerance or Continuous Replication) > + * > + * Copyright (C) 2014 FUJITSU LIMITED > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory. Same comment for all new files.
On 10/08/2014 11:02 PM, Eric Blake wrote: > On 09/23/2014 03:23 AM, Yang Hongyang wrote: >> introduce an api colo_supported() to indicate COLO support, returns >> true if colo supported (configured with --enable-colo). >> >> Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> >> --- > >> +++ b/include/migration/migration-colo.h >> @@ -0,0 +1,18 @@ >> +/* >> + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) >> + * (a.k.a. Fault Tolerance or Continuous Replication) >> + * >> + * Copyright (C) 2014 FUJITSU LIMITED >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2. See >> + * the COPYING file in the top-level directory. > > Is there any reason you are forbidding the use of this file in a GPLv3 > project? We prefer new files to be GPLv2+, not GPLv2-only (by the use > of the "or later" clause), unless there is strong reason why it is not > possible. I don't know the reason, and I think it is OK to be GPLv2+ Thanks Wen Congyang > > >> +++ b/migration-colo.c >> @@ -0,0 +1,16 @@ >> +/* >> + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) >> + * (a.k.a. Fault Tolerance or Continuous Replication) >> + * >> + * Copyright (C) 2014 FUJITSU LIMITED >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2. See >> + * the COPYING file in the top-level directory. > > Same comment for all new files. >
diff --git a/Makefile.objs b/Makefile.objs index 97db978..9654c04 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -49,6 +49,7 @@ common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration.o migration-tcp.o +common-obj-$(CONFIG_COLO) += migration-colo.o common-obj-y += vmstate.o common-obj-y += qemu-file.o common-obj-$(CONFIG_RDMA) += migration-rdma.o diff --git a/include/migration/migration-colo.h b/include/migration/migration-colo.h new file mode 100644 index 0000000..35b384c --- /dev/null +++ b/include/migration/migration-colo.h @@ -0,0 +1,18 @@ +/* + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) + * (a.k.a. Fault Tolerance or Continuous Replication) + * + * Copyright (C) 2014 FUJITSU LIMITED + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#ifndef QEMU_MIGRATION_COLO_H +#define QEMU_MIGRATION_COLO_H + +#include "qemu-common.h" + +bool colo_supported(void); + +#endif diff --git a/migration-colo.c b/migration-colo.c new file mode 100644 index 0000000..1d3bef8 --- /dev/null +++ b/migration-colo.c @@ -0,0 +1,16 @@ +/* + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) + * (a.k.a. Fault Tolerance or Continuous Replication) + * + * Copyright (C) 2014 FUJITSU LIMITED + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#include "migration/migration-colo.h" + +bool colo_supported(void) +{ + return true; +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 5e347d0..9fe6b4c 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -40,3 +40,4 @@ stub-obj-$(CONFIG_WIN32) += fd-register.o stub-obj-y += cpus.o stub-obj-y += kvm.o stub-obj-y += qmp_pc_dimm_device_list.o +stub-obj-y += migration-colo.o diff --git a/stubs/migration-colo.c b/stubs/migration-colo.c new file mode 100644 index 0000000..b9ee6a0 --- /dev/null +++ b/stubs/migration-colo.c @@ -0,0 +1,16 @@ +/* + * COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) + * (a.k.a. Fault Tolerance or Continuous Replication) + * + * Copyright (C) 2014 FUJITSU LIMITED + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + */ + +#include "migration/migration-colo.h" + +bool colo_supported(void) +{ + return false; +}
introduce an api colo_supported() to indicate COLO support, returns true if colo supported (configured with --enable-colo). Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> --- Makefile.objs | 1 + include/migration/migration-colo.h | 18 ++++++++++++++++++ migration-colo.c | 16 ++++++++++++++++ stubs/Makefile.objs | 1 + stubs/migration-colo.c | 16 ++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 include/migration/migration-colo.h create mode 100644 migration-colo.c create mode 100644 stubs/migration-colo.c