|
 |
67ad33 |
From e49e68d5b504f22919c6134e3a06d3838e872d2f Mon Sep 17 00:00:00 2001
|
|
|
96a5f8 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
96a5f8 |
Date: Tue, 19 Feb 2013 14:39:05 -0500
|
|
|
96a5f8 |
Subject: [PATCH] configure: Add --enable-migration-from-qemu-kvm
|
|
|
96a5f8 |
|
|
|
96a5f8 |
This switch will turn on all the migration compat bits needed to
|
|
|
96a5f8 |
perform migration from qemu-kvm to qemu. It's just a stub for now.
|
|
|
96a5f8 |
|
|
|
96a5f8 |
This compat will break incoming migration from qemu < 1.3, but for
|
|
|
96a5f8 |
distros where qemu-kvm was the only shipped package for years it's
|
|
|
96a5f8 |
not a big loss (and I don't know any way to avoid it).
|
|
|
96a5f8 |
---
|
|
|
96a5f8 |
configure | 10 ++++++++++
|
|
|
96a5f8 |
1 file changed, 10 insertions(+)
|
|
|
96a5f8 |
|
|
|
96a5f8 |
diff --git a/configure b/configure
|
|
|
8a0cce |
index eb74510..f558a21 100755
|
|
|
96a5f8 |
--- a/configure
|
|
|
96a5f8 |
+++ b/configure
|
|
|
7fae7f |
@@ -179,6 +179,7 @@ xfs=""
|
|
|
96a5f8 |
vhost_net="no"
|
|
|
7fae7f |
vhost_scsi="no"
|
|
|
96a5f8 |
kvm="no"
|
|
|
96a5f8 |
+migrate_from_kvm="no"
|
|
|
96a5f8 |
gprof="no"
|
|
|
96a5f8 |
debug_tcg="no"
|
|
|
96a5f8 |
debug="no"
|
|
|
8a0cce |
@@ -776,6 +777,8 @@ for opt do
|
|
|
96a5f8 |
;;
|
|
|
96a5f8 |
--enable-kvm) kvm="yes"
|
|
|
96a5f8 |
;;
|
|
|
96a5f8 |
+ --enable-migration-from-qemu-kvm) migrate_from_kvm="yes"
|
|
|
96a5f8 |
+ ;;
|
|
|
96a5f8 |
--disable-tcg-interpreter) tcg_interpreter="no"
|
|
|
96a5f8 |
;;
|
|
|
96a5f8 |
--enable-tcg-interpreter) tcg_interpreter="yes"
|
|
|
8a0cce |
@@ -1135,6 +1138,9 @@ echo " --enable-bluez enable bluez stack connectivity"
|
|
|
96a5f8 |
echo " --disable-slirp disable SLIRP userspace network connectivity"
|
|
|
96a5f8 |
echo " --disable-kvm disable KVM acceleration support"
|
|
|
96a5f8 |
echo " --enable-kvm enable KVM acceleration support"
|
|
|
96a5f8 |
+echo " --enable-migration-from-qemu-kvm Allow migration from qemu-kvm."
|
|
|
96a5f8 |
+echo " This will break migration from "
|
|
|
96a5f8 |
+echo " qemu < 1.3 in most cases"
|
|
|
96a5f8 |
echo " --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)"
|
|
|
96a5f8 |
echo " --disable-nptl disable usermode NPTL support"
|
|
|
96a5f8 |
echo " --enable-nptl enable usermode NPTL support"
|
|
|
8a0cce |
@@ -3553,6 +3559,7 @@ echo "Linux AIO support $linux_aio"
|
|
|
96a5f8 |
echo "ATTR/XATTR support $attr"
|
|
|
96a5f8 |
echo "Install blobs $blobs"
|
|
|
96a5f8 |
echo "KVM support $kvm"
|
|
|
96a5f8 |
+echo "Migrate from qemu-kvm $migrate_from_kvm"
|
|
|
96a5f8 |
echo "TCG interpreter $tcg_interpreter"
|
|
|
96a5f8 |
echo "fdt support $fdt"
|
|
|
96a5f8 |
echo "preadv support $preadv"
|
|
|
8a0cce |
@@ -3862,6 +3869,9 @@ fi
|
|
|
96a5f8 |
if test "$signalfd" = "yes" ; then
|
|
|
96a5f8 |
echo "CONFIG_SIGNALFD=y" >> $config_host_mak
|
|
|
96a5f8 |
fi
|
|
|
96a5f8 |
+if test "$migrate_from_kvm" = "yes"; then
|
|
|
96a5f8 |
+ echo "CONFIG_MIGRATE_FROM_QEMU_KVM=y" >> $config_host_mak
|
|
|
96a5f8 |
+fi
|
|
|
96a5f8 |
if test "$tcg_interpreter" = "yes" ; then
|
|
|
96a5f8 |
echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak
|
|
|
96a5f8 |
fi
|