From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtBl-0004v2-8t for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:49:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwtBh-00034I-37 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:49:25 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:37435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwtBg-00034E-T5 for qemu-devel@nongnu.org; Thu, 12 Nov 2015 09:49:21 -0500 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 12 Nov 2015 07:49:18 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (b03cxnp07029.gho.boulder.ibm.com [9.17.130.16]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 747DF1FF002D for ; Thu, 12 Nov 2015 07:37:26 -0700 (MST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tACEnExY1769884 for ; Thu, 12 Nov 2015 07:49:14 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tACEnE9Y025626 for ; Thu, 12 Nov 2015 07:49:14 -0700 References: <1447328084-11563-1-git-send-email-dgilbert@redhat.com> From: "Jason J. Herne" Message-ID: <5644A6E9.1020705@linux.vnet.ibm.com> Date: Thu, 12 Nov 2015 09:49:13 -0500 MIME-Version: 1.0 In-Reply-To: <1447328084-11563-1-git-send-email-dgilbert@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/1] migrate-start-postcopy: Improve text Reply-To: jjherne@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" , qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: borntraeger@de.ibm.com, bharata@linux.vnet.ibm.com On 11/12/2015 06:34 AM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > Improve the text in both the qapi-schema and hmp help to point out > you need to set the postcopy-ram capability prior to issuing > migrate-start-postcopy. > > Also fix the text of the migrate_start_postcopy error that > deals with capabilities. > > Signed-off-by: Dr. David Alan Gilbert > --- > v2 > Updated text to Erik's suggestion > Fixed error text error spotted by Christian > > hmp-commands.hx | 4 +++- > migration/migration.c | 2 +- > qapi-schema.json | 4 +++- > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 8939b98..a3e5cb7 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1011,7 +1011,9 @@ ETEXI > .name = "migrate_start_postcopy", > .args_type = "", > .params = "", > - .help = "Switch migration to postcopy mode", > + .help = "Followup to a migration command to switch the migration" > + " to postcopy mode. The x-postcopy-ram capability must " > + "be set before the original migration command.", > .mhandler.cmd = hmp_migrate_start_postcopy, > }, > > diff --git a/migration/migration.c b/migration/migration.c > index 5df490a..9bd2ce7 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -768,7 +768,7 @@ void qmp_migrate_start_postcopy(Error **errp) > MigrationState *s = migrate_get_current(); > > if (!migrate_postcopy_ram()) { > - error_setg(errp, "Enable postcopy with migration_set_capability before" > + error_setg(errp, "Enable postcopy with migrate_set_capability before" > " the start of migration"); > return; > } > diff --git a/qapi-schema.json b/qapi-schema.json > index 8c3a42a..3973fa6 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -706,7 +706,9 @@ > ## > # @migrate-start-postcopy > # > -# Switch migration to postcopy mode > +# Followup to a migration command to switch the migration to postcopy mode. > +# The x-postcopy-ram capability must be set before the original migration > +# command. > # > # Since: 2.5 > { 'command': 'migrate-start-postcopy' } > I like the rewording especially in the help text. This will make it far clearer to the user. fwiw, Acked-by: Jason J. Herne -- -- Jason J. Herne (jjherne@linux.vnet.ibm.com)