From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpX08-0004Rj-J9 for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpX03-0002uO-F0 for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:31 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:22209) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpX02-0002sU-Ok for qemu-devel@nongnu.org; Thu, 29 Sep 2016 04:47:27 -0400 From: zhanghailiang Date: Thu, 29 Sep 2016 16:46:37 +0800 Message-ID: <1475138797-9908-18-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1475138797-9908-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1475138797-9908-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame (Base) v20 17/17] configure: Support enable/disable COLO feature List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: amit.shah@redhat.com, quintela@redhat.com Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, zhanghailiang , Gonglei configure --enable-colo/--disable-colo to switch COLO support on/off. COLO feature is enabled by default. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Signed-off-by: Gonglei Reviewed-by: Dr. David Alan Gilbert --- v19: - fix colo_supported() to return true v11: - Turn COLO on in default (Eric's suggestion) --- configure | 11 +++++++++++ migration/colo.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/configure b/configure index df4a247..9afeb2f 100755 --- a/configure +++ b/configure @@ -230,6 +230,7 @@ vhost_net="no" vhost_scsi="no" vhost_vsock="no" kvm="no" +colo="yes" rdma="" gprof="no" debug_tcg="no" @@ -917,6 +918,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" @@ -1360,6 +1365,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 vde support for vde network netmap support for netmap network @@ -4884,6 +4890,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" @@ -5497,6 +5504,10 @@ if have_backend "syslog"; 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 diff --git a/migration/colo.c b/migration/colo.c index 105cb3b..d50058e 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -24,7 +24,7 @@ bool colo_supported(void) { - return false; + return true; } bool migration_in_colo_state(void) -- 1.8.3.1