From patchwork Tue Feb 19 22:39:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 221931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3AA7C2C008D for ; Wed, 20 Feb 2013 11:25:46 +1100 (EST) Received: from localhost ([::1]:54794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7vsL-0002AM-Vu for incoming@patchwork.ozlabs.org; Tue, 19 Feb 2013 17:41:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:57857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7vrR-00009d-23 for qemu-devel@nongnu.org; Tue, 19 Feb 2013 17:40:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U7vrM-0008Fo-Su for qemu-devel@nongnu.org; Tue, 19 Feb 2013 17:40:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U7vrM-0008BZ-LR; Tue, 19 Feb 2013 17:40:24 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1JMeDCr014301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 19 Feb 2013 17:40:17 -0500 Received: from colepc.redhat.com (ovpn-113-128.phx2.redhat.com [10.3.113.128]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r1JMe6CY011875; Tue, 19 Feb 2013 17:40:06 -0500 From: Cole Robinson To: qemu-devel@nongnu.org Date: Tue, 19 Feb 2013 17:39:59 -0500 Message-Id: <447a8e1d1d24ed89db081c9c912627335267bfbc.1361313340.git.crobinso@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Marcelo Tosatti , qemu-stable , Cole Robinson Subject: [Qemu-devel] [PATCH 1/4] configure: Add --enable-migration-from-qemu-kvm 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 This switch will turn on all the migration compat bits needed to perform migration from qemu-kvm to qemu. It's just a stub for now. This compat will break incoming migration from qemu < 1.3, but for distros where qemu-kvm was the only shipped package for years it's not a big loss (and I don't know any way to avoid it). Signed-off-by: Cole Robinson --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure b/configure index bf5970f..296f488 100755 --- a/configure +++ b/configure @@ -170,6 +170,7 @@ xfs="" vhost_net="no" kvm="no" +migrate_from_kvm="no" gprof="no" debug_tcg="no" debug="no" @@ -759,6 +760,8 @@ for opt do ;; --enable-kvm) kvm="yes" ;; + --enable-migration-from-qemu-kvm) migrate_from_kvm="yes" + ;; --disable-tcg-interpreter) tcg_interpreter="no" ;; --enable-tcg-interpreter) tcg_interpreter="yes" @@ -1087,6 +1090,9 @@ echo " --enable-bluez enable bluez stack connectivity" echo " --disable-slirp disable SLIRP userspace network connectivity" echo " --disable-kvm disable KVM acceleration support" echo " --enable-kvm enable KVM acceleration support" +echo " --enable-migration-from-qemu-kvm Allow migration from qemu-kvm." +echo " This will break migration from " +echo " qemu < 1.3 in most cases" echo " --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)" echo " --disable-nptl disable usermode NPTL support" echo " --enable-nptl enable usermode NPTL support" @@ -3334,6 +3340,7 @@ echo "Linux AIO support $linux_aio" echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" echo "KVM support $kvm" +echo "Migrate from qemu-kvm $migrate_from_kvm" echo "TCG interpreter $tcg_interpreter" echo "fdt support $fdt" echo "preadv support $preadv" @@ -3622,6 +3629,9 @@ fi if test "$signalfd" = "yes" ; then echo "CONFIG_SIGNALFD=y" >> $config_host_mak fi +if test "$migrate_from_kvm" = "yes"; then + echo "CONFIG_MIGRATE_FROM_QEMU_KVM=y" >> $config_host_mak +fi if test "$tcg_interpreter" = "yes" ; then echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak fi