From nobody Sun Apr 28 14:49:48 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.zohomail.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 1518018253918629.1457070666632; Wed, 7 Feb 2018 07:44:13 -0800 (PST) Received: from localhost ([::1]:53407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejRtM-0005MW-Tt for importer@patchew.org; Wed, 07 Feb 2018 10:44:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejRrN-0004Dk-HV for qemu-devel@nongnu.org; Wed, 07 Feb 2018 10:42:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejRrJ-000576-QC for qemu-devel@nongnu.org; Wed, 07 Feb 2018 10:42:09 -0500 Received: from 7.mo2.mail-out.ovh.net ([188.165.48.182]:45402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejRrJ-00053u-J3 for qemu-devel@nongnu.org; Wed, 07 Feb 2018 10:42:05 -0500 Received: from player157.ha.ovh.net (gw6.ovh.net [213.251.189.206]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id 68BEC119890 for ; Wed, 7 Feb 2018 16:41:53 +0100 (CET) Received: from bahia.lan (lns-bzn-46-82-253-208-248.adsl.proxad.net [82.253.208.248]) (Authenticated sender: groug@kaod.org) by player157.ha.ovh.net (Postfix) with ESMTPA id CF3545000A8; Wed, 7 Feb 2018 16:41:50 +0100 (CET) From: Greg Kurz To: qemu-devel@nongnu.org Date: Wed, 07 Feb 2018 16:41:43 +0100 Message-ID: <151801810352.29167.4832480228518630626.stgit@bahia.lan> User-Agent: StGit/0.17.1-46-g6855-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 2180023698866346344 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtfedrudeigdektdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.48.182 Subject: [Qemu-devel] [PATCH] migration: improve documentation of postcopy-ram 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: "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 This capability must have the same value on both source and destination, otherwise migration fails (commit 875fcd013ab6 "migration: incoming postcopy advise sanity checks"). Let's write it down in various places where postcopy-ram is documented. Signed-off-by: Greg Kurz Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Eric Blake --- docs/devel/migration.rst | 4 ++-- hmp-commands.hx | 3 ++- qapi/migration.json | 10 ++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index bf97080dac2f..9d1b7657f0cf 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -387,8 +387,8 @@ doesn't finish in a given time the switch is made to po= stcopy. Enabling postcopy ----------------- =20 -To enable postcopy, issue this command on the monitor prior to the -start of migration: +To enable postcopy, issue this command on the monitor (both source and +destination) prior to the start of migration: =20 ``migrate_set_capability postcopy-ram on`` =20 diff --git a/hmp-commands.hx b/hmp-commands.hx index 15620c94d3fc..d26eb4119b9d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1041,7 +1041,8 @@ ETEXI .params =3D "", .help =3D "Followup to a migration command to switch the mig= ration" " to postcopy mode. The postcopy-ram capability must= " - "be set before the original migration command.", + "be set on both source and destination before the " + "original migration command .", .cmd =3D hmp_migrate_start_postcopy, }, =20 diff --git a/qapi/migration.json b/qapi/migration.json index 4cd3d1315884..7f465a1902ce 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -327,8 +327,10 @@ # to speed up convergence of RAM migration. (since 1.6) # # @postcopy-ram: Start executing on the migration target before all of RAM= has -# been migrated, pulling the remaining pages along as needed. NOT= E: If -# the migration fails during postcopy the VM will fail. (since 2= .6) +# been migrated, pulling the remaining pages along as needed. The +# capacity must have the same setting on both source and target +# or migration will not even start. NOTE: If the migration fails = during +# postcopy the VM will fail. (since 2.6) # # @x-colo: If enabled, migration will never end, and the state of the VM o= n the # primary side will be migrated continuously to the VM on secondary @@ -742,8 +744,8 @@ # @migrate-start-postcopy: # # Followup to a migration command to switch the migration to postcopy mode. -# The postcopy-ram capability must be set before the original migration -# command. +# The postcopy-ram capability must be set on both source and destination +# before the original migration command. # # Since: 2.5 #