From patchwork Thu Sep 1 03:24:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 9308273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F17A60760 for ; Thu, 1 Sep 2016 03:30:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 778FF29114 for ; Thu, 1 Sep 2016 03:30:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A2B22916C; Thu, 1 Sep 2016 03:30:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5756B29114 for ; Thu, 1 Sep 2016 03:30:07 +0000 (UTC) Received: from localhost ([::1]:56849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfIha-0004rK-Cu for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Aug 2016 23:30:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfIcq-0000My-QA for qemu-devel@nongnu.org; Wed, 31 Aug 2016 23:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bfIcm-0004AD-39 for qemu-devel@nongnu.org; Wed, 31 Aug 2016 23:25:11 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:40747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bfIcl-00047z-EU for qemu-devel@nongnu.org; Wed, 31 Aug 2016 23:25:08 -0400 Received: from 172.24.1.136 (EHLO szxeml428-hub.china.huawei.com) ([172.24.1.136]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id CHE21762; Thu, 01 Sep 2016 11:25:00 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.235.1; Thu, 1 Sep 2016 11:24:53 +0800 From: zhanghailiang To: Date: Thu, 1 Sep 2016 11:24:25 +0800 Message-ID: <1472700265-16760-23-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.7.2.windows.1 In-Reply-To: <1472700265-16760-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1472700265-16760-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.57C79F8C.01A2, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 177c476a98b7986fb7fadd3aa447fa5c X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Subject: [Qemu-devel] [PATCH COLO-Frame v19 22/22] configure: Support enable/disable COLO feature X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, Gonglei , amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhanghailiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 e7aa73c..4aea244 100755 --- a/configure +++ b/configure @@ -230,6 +230,7 @@ xfs="" vhost_net="no" vhost_scsi="no" kvm="no" +colo="yes" rdma="" gprof="no" debug_tcg="no" @@ -919,6 +920,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" @@ -1356,6 +1361,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 @@ -4866,6 +4872,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" @@ -5477,6 +5484,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 diff --git a/migration/colo.c b/migration/colo.c index ee20703..6ecd584 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -29,7 +29,7 @@ static bool vmstate_loading; bool colo_supported(void) { - return false; + return true; } bool migration_in_colo_state(void)