On 12/15/2015 04:22 PM, zhanghailiang wrote: > configure --enable-colo/--disable-colo to switch COLO > support on/off. > COLO support is On by default. > > Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com> > Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com> > Signed-off-by: Gonglei <arei.gong...@huawei.com> > Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > --- > v11: > - Turn COLO on in default (Eric's suggestion) > > Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com>
I think you forgot to remove this line. Thanks Wen Congyang > --- > configure | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/configure b/configure > index b9552fd..32e466f 100755 > --- a/configure > +++ b/configure > @@ -260,6 +260,7 @@ xfs="" > vhost_net="no" > vhost_scsi="no" > kvm="no" > +colo="yes" > rdma="" > gprof="no" > debug_tcg="no" > @@ -939,6 +940,10 @@ for opt do > ;; > --enable-kvm) kvm="yes" > ;; > + --disable-colo) colo="no" > + ;; > + --enable-colo) colo="yes" > + ;; > --disable-tcg-interpreter) tcg_interpreter="no" > ;; > --enable-tcg-interpreter) tcg_interpreter="yes" > @@ -1362,6 +1367,7 @@ disabled with --disable-FEATURE, default is enabled if > available: > fdt fdt device tree > bluez bluez stack connectivity > kvm KVM acceleration support > + colo COarse-grain LOck-stepping VM for Non-stop Service > rdma RDMA-based migration support > uuid uuid support > vde support for vde network > @@ -4792,6 +4798,7 @@ echo "Linux AIO support $linux_aio" > echo "ATTR/XATTR support $attr" > echo "Install blobs $blobs" > echo "KVM support $kvm" > +echo "COLO support $colo" > echo "RDMA support $rdma" > echo "TCG interpreter $tcg_interpreter" > echo "fdt support $fdt" > @@ -5381,6 +5388,10 @@ if have_backend "ftrace"; then > fi > echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak > > +if test "$colo" = "yes"; then > + echo "CONFIG_COLO=y" >> $config_host_mak > +fi > + > if test "$rdma" = "yes" ; then > echo "CONFIG_RDMA=y" >> $config_host_mak > fi >
