From: "Michael R. Hines" <mrhi...@us.ibm.com>
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 2b6c1fe..15356d6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -52,6 +52,7 @@ common-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += migration.o migration-tcp.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 57ee62a..64c0d5e 100755 --- a/configure +++ b/configure @@ -182,6 +182,7 @@ kvm="no" rdma="" gprof="no" debug_tcg="no" +mc="" debug="no" strip_opt="yes" tcg_interpreter="no" @@ -969,6 +970,10 @@ for opt do ;; --enable-libssh2) libssh2="yes" ;; + --disable-mc) mc="no" + ;; + --enable-mc) mc="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1200,6 +1205,8 @@ echo " --gcov=GCOV use specified gcov [$gcov_tool]" echo " --enable-tpm enable TPM support" echo " --disable-libssh2 disable ssh block device support" echo " --enable-libssh2 enable ssh block device support" +echo " --disable-mc disable Micro-Checkpointing support" +echo " --enable-mc enable Micro-Checkpointing support" echo "" echo "NOTE: The object files are built at the place where configure is launched" exit 1 @@ -1861,6 +1868,35 @@ EOF fi fi +################################################## +# Micro-Checkpointing requires netlink +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 @@ -3723,6 +3759,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" @@ -4206,6 +4243,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 @@ -4633,6 +4674,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