From nobody Thu May 2 06:53:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493808274309306.281782493552; Wed, 3 May 2017 03:44:34 -0700 (PDT) Received: from localhost ([::1]:35730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5rlo-0001PL-2X for importer@patchew.org; Wed, 03 May 2017 06:44:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5rkS-0000do-Na for qemu-devel@nongnu.org; Wed, 03 May 2017 06:43:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5rkN-0001PG-QX for qemu-devel@nongnu.org; Wed, 03 May 2017 06:43:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5rkN-0001Ol-GD for qemu-devel@nongnu.org; Wed, 03 May 2017 06:43:03 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9DD873B717 for ; Wed, 3 May 2017 10:43:01 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-196.ams2.redhat.com [10.36.117.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7339D7ED9E; Wed, 3 May 2017 10:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9DD873B717 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=dgilbert@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9DD873B717 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, jcody@redhat.com, kwolf@redhat.com Date: Wed, 3 May 2017 11:42:57 +0100 Message-Id: <20170503104257.5127-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 03 May 2017 10:43:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] block migration: Allow compile time disable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kashyap@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Many users now prefer to use drive_mirror over NBD as an alternative to the older migrate -b option; drive_mirror is more complex to setup but gives you more options (e.g. only migrating some of the disks if some of them are shared). Allow the large chunk of block migration code to be compiled out for those who don't use it. Based on a downstream-patch we've had for a while by Jeff Cody. Signed-off-by: Dr. David Alan Gilbert --- configure | 11 +++++++++++ migration/Makefile.objs | 2 +- migration/migration.c | 12 ++++++++++++ vl.c | 2 ++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 48a9370cc6..69eed5fb8d 100755 --- a/configure +++ b/configure @@ -316,6 +316,7 @@ vte=3D"" virglrenderer=3D"" tpm=3D"yes" libssh2=3D"" +live_block_migration=3D"yes" numa=3D"" tcmalloc=3D"no" jemalloc=3D"no" @@ -1168,6 +1169,10 @@ for opt do ;; --enable-libssh2) libssh2=3D"yes" ;; + --disable-live-block-migration) live_block_migration=3D"no" + ;; + --enable-live-block-migration) live_block_migration=3D"yes" + ;; --disable-numa) numa=3D"no" ;; --enable-numa) numa=3D"yes" @@ -1400,6 +1405,7 @@ disabled with --disable-FEATURE, default is enabled i= f available: libnfs nfs support smartcard smartcard support (libcacard) libusb libusb (for usb passthrough) + live-block-migration Block migration in the main migration stream usb-redir usb network redirection support lzo support of lzo compression library snappy support of snappy compression library @@ -5210,6 +5216,7 @@ echo "TPM support $tpm" echo "libssh2 support $libssh2" echo "TPM passthrough $tpm_passthrough" echo "QOM debugging $qom_cast_debug" +echo "Live block migration $live_block_migration" echo "lzo support $lzo" echo "snappy support $snappy" echo "bzip2 support $bzip2" @@ -5776,6 +5783,10 @@ if test "$libssh2" =3D "yes" ; then echo "LIBSSH2_LIBS=3D$libssh2_libs" >> $config_host_mak fi =20 +if test "$live_block_migration" =3D "yes" ; then + echo "CONFIG_LIVE_BLOCK_MIGRATION=3Dy" >> $config_host_mak +fi + # USB host support if test "$libusb" =3D "yes"; then echo "HOST_USB=3Dlibusb legacy" >> $config_host_mak diff --git a/migration/Makefile.objs b/migration/Makefile.objs index 480dd493a9..200b5e0c67 100644 --- a/migration/Makefile.objs +++ b/migration/Makefile.objs @@ -9,5 +9,5 @@ common-obj-y +=3D qjson.o =20 common-obj-$(CONFIG_RDMA) +=3D rdma.o =20 -common-obj-y +=3D block.o +common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) +=3D block.o =20 diff --git a/migration/migration.c b/migration/migration.c index 353f2728cf..ffce72aabc 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -692,6 +692,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) =20 populate_ram_info(info, s); =20 +#ifdef CONFIG_LIVE_BLOCK_MIGRATION if (blk_mig_active()) { info->has_disk =3D true; info->disk =3D g_malloc0(sizeof(*info->disk)); @@ -699,6 +700,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->disk->remaining =3D blk_mig_bytes_remaining(); info->disk->total =3D blk_mig_bytes_total(); } +#endif =20 if (cpu_throttle_active()) { info->has_cpu_throttle_percentage =3D true; @@ -720,6 +722,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) =20 populate_ram_info(info, s); =20 +#ifdef CONFIG_LIVE_BLOCK_MIGRATION if (blk_mig_active()) { info->has_disk =3D true; info->disk =3D g_malloc0(sizeof(*info->disk)); @@ -727,6 +730,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) info->disk->remaining =3D blk_mig_bytes_remaining(); info->disk->total =3D blk_mig_bytes_total(); } +#endif =20 get_xbzrle_cache_stats(info); break; @@ -1222,6 +1226,14 @@ void qmp_migrate(const char *uri, bool has_blk, bool= blk, params.blk =3D has_blk && blk; params.shared =3D has_inc && inc; =20 +#ifndef CONFIG_LIVE_BLOCK_MIGRATION + if (params.blk || params.shared) { + error_setg(errp, "QEMU compiled without old-style block migration.= " + "Use drive_mirror+NBD."); + return; + } +#endif + if (migration_is_setup_or_active(s->state) || s->state =3D=3D MIGRATION_STATUS_CANCELLING || s->state =3D=3D MIGRATION_STATUS_COLO) { diff --git a/vl.c b/vl.c index f46e070e0d..d0fc99a41d 100644 --- a/vl.c +++ b/vl.c @@ -4471,7 +4471,9 @@ int main(int argc, char **argv, char **envp) } } =20 +#ifdef CONFIG_LIVE_BLOCK_MIGRATION blk_mig_init(); +#endif ram_mig_init(); =20 /* If the currently selected machine wishes to override the units-per-= bus --=20 2.12.2