From patchwork Tue Feb 18 08:50:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrhines@linux.vnet.ibm.com X-Patchwork-Id: 321325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8F31D2C00C8 for ; Tue, 18 Feb 2014 19:56:13 +1100 (EST) Received: from localhost ([::1]:47197 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgTL-0008Fw-6U for incoming@patchwork.ozlabs.org; Tue, 18 Feb 2014 03:56:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgOq-0001Ba-SH for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFgOh-0001i2-TY for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:32 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:52144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFgOh-0001hx-ND for qemu-devel@nongnu.org; Tue, 18 Feb 2014 03:51:23 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Feb 2014 01:51:23 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Feb 2014 01:51:21 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id F2F2B1FF003E for ; Tue, 18 Feb 2014 01:51:20 -0700 (MST) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by b03cxnp08026.gho.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1I8ovqp9961792 for ; Tue, 18 Feb 2014 09:50:57 +0100 Received: from d03av05.boulder.ibm.com (localhost [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1I8pJLx007092 for ; Tue, 18 Feb 2014 01:51:20 -0700 Received: from mrhinesdev.crl.ibm.com ([9.186.105.50]) by d03av05.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s1I8oYNF004973; Tue, 18 Feb 2014 01:51:15 -0700 From: mrhines@linux.vnet.ibm.com To: qemu-devel@nongnu.org Date: Tue, 18 Feb 2014 16:50:26 +0800 Message-Id: <1392713429-18201-10-git-send-email-mrhines@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1392713429-18201-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1392713429-18201-1-git-send-email-mrhines@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14021808-1344-0000-0000-000005D8C93F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.159 Cc: GILR@il.ibm.com, SADEKJ@il.ibm.com, pbonzini@redhat.com, quintela@redhat.com, EREZH@il.ibm.com, owasserm@redhat.com, junqing.wang@cs2c.com.cn, onom@us.ibm.com, abali@us.ibm.com, isaku.yamahata@gmail.com, gokul@us.ibm.com, dbulkow@gmail.com, hinesmr@cn.ibm.com, BIRAN@il.ibm.com, lig.fnst@cn.fujitsu.com, "Michael R. Hines" Subject: [Qemu-devel] [RFC PATCH v2 09/12] mc: configure and makefile support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Michael R. Hines" Self-explanatory. Signed-off-by: Michael R. Hines --- Makefile.objs | 1 + configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/Makefile.objs b/Makefile.objs index ac1d0e1..db70f93 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -53,6 +53,7 @@ common-obj-y += migration.o migration-tcp.o common-obj-y += vmstate.o common-obj-y += qemu-file.o common-obj-$(CONFIG_RDMA) += migration-rdma.o +common-obj-$(CONFIG_MC) += migration-checkpoint.o common-obj-y += qemu-char.o #aio.o common-obj-y += block-migration.o common-obj-y += page_cache.o xbzrle.o diff --git a/configure b/configure index 0eadab5..507ee99 100755 --- a/configure +++ b/configure @@ -197,6 +197,7 @@ kvm="no" rdma="" gprof="no" debug_tcg="no" +mc="" debug="no" strip_opt="yes" tcg_interpreter="no" @@ -1001,6 +1002,10 @@ for opt do ;; --enable-libssh2) libssh2="yes" ;; + --disable-mc) mc="no" + ;; + --enable-mc) mc="yes" + ;; --enable-vhdx) vhdx="yes" ;; --disable-vhdx) vhdx="no" @@ -1189,6 +1194,8 @@ Advanced options (experts only): --enable-kvm enable KVM acceleration support --disable-rdma disable RDMA-based migration support --enable-rdma enable RDMA-based migration support + --disable-mc disable Micro-Checkpointing support + --enable-mc enable Micro-Checkpointing support --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI) --enable-system enable all system emulation targets --disable-system disable all system emulation targets @@ -1901,6 +1908,35 @@ EOF fi fi +################################################## +# Micro-Checkpointing requires netlink (libnl3) +if test "$mc" != "no" ; then + cat > $TMPC < +#include +#include +#include +#include +#include +int main(void) { return 0; } +EOF + mc_libs="-lnl-3 -lnl-cli-3 -lnl-route-3" + mc_cflags="-I/usr/include/libnl3" + if compile_prog "$mc_cflags" "$mc_libs" ; then + mc="yes" + libs_softmmu="$libs_softmmu $mc_libs" + QEMU_CFLAGS="$QEMU_CFLAGS $mc_cflags" + else + if test "$mc" = "yes" ; then + error_exit \ + " NetLink v3 libs/headers not present." \ + " Please install the libnl3-*-dev(el) packages from your distro." + fi + mc="no" + fi +fi + + ########################################## # VNC TLS/WS detection if test "$vnc" = "yes" -a \( "$vnc_tls" != "no" -o "$vnc_ws" != "no" \) ; then @@ -3829,6 +3865,7 @@ echo "KVM support $kvm" echo "RDMA support $rdma" echo "TCG interpreter $tcg_interpreter" echo "fdt support $fdt" +echo "Micro checkpointing $mc" echo "preadv support $preadv" echo "fdatasync $fdatasync" echo "madvise $madvise" @@ -4334,6 +4371,10 @@ if test "$rdma" = "yes" ; then echo "CONFIG_RDMA=y" >> $config_host_mak fi +if test "$mc" = "yes" ; then + echo "CONFIG_MC=y" >> $config_host_mak +fi + if test "$tcg_interpreter" = "yes"; then QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES" elif test "$ARCH" = "sparc64" ; then @@ -4769,6 +4810,10 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak done # for target in $targets +if test "$mc" = "yes" ; then +echo "CONFIG_MC=y" >> $config_host_mak +fi + if [ "$pixman" = "internal" ]; then echo "config-host.h: subdir-pixman" >> $config_host_mak fi