From: "Michael R. Hines" <mrhi...@us.ibm.com>
Self-explanatory.
Signed-off-by: Michael R. Hines <mrhi...@us.ibm.com>
---
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 <<EOF
+#include <libnl3/netlink/route/qdisc/plug.h>
+#include <libnl3/netlink/route/class.h>
+#include <libnl3/netlink/cli/utils.h>
+#include <libnl3/netlink/cli/tc.h>
+#include <libnl3/netlink/cli/qdisc.h>
+#include <libnl3/netlink/cli/link.h>
+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
--
1.8.1.2
