From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=58063 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxpAn-0002PF-2w for qemu-devel@nongnu.org; Thu, 10 Mar 2011 18:21:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxpAl-00081P-T3 for qemu-devel@nongnu.org; Thu, 10 Mar 2011 18:21:36 -0500 Received: from mail-gw0-f45.google.com ([74.125.83.45]:47247) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxpAl-00081K-Qj for qemu-devel@nongnu.org; Thu, 10 Mar 2011 18:21:35 -0500 Received: by gwb19 with SMTP id 19so808728gwb.4 for ; Thu, 10 Mar 2011 15:21:35 -0800 (PST) Message-ID: <4D795CFD.8050707@codemonkey.ws> Date: Thu, 10 Mar 2011 17:21:33 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1299686074-25719-1-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1299686074-25719-1-git-send-email-Jes.Sorensen@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jes.Sorensen@redhat.com Cc: qemu-devel@nongnu.org, lcapitulino@redhat.com On 03/09/2011 09:54 AM, Jes.Sorensen@redhat.com wrote: > From: Jes Sorensen > > client_migrate_info was merged badly, It wasn't merged badly, it was implemented badly. The initial description confused me because it sounded like a bad merge conflict resolution but it just was wrong from the start. > placing it between the command > and the documentation for another command. In addition it did not > respect the general rule of hmp-commands.hx, of having command > definition before the documentation. > > Signed-off-by: Jes Sorensen Applied. Thanks. Regards, Anthony Liguori > --- > hmp-commands.hx | 32 ++++++++++++++++---------------- > 1 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 372bef4..834e6a8 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -821,16 +821,12 @@ Set maximum tolerated downtime (in seconds) for migration. > ETEXI > > { > - .name = "snapshot_blkdev", > - .args_type = "device:B,snapshot_file:s?,format:s?", > - .params = "device [new-image-file] [format]", > - .help = "initiates a live snapshot\n\t\t\t" > - "of device. If a new image file is specified, the\n\t\t\t" > - "new image file will become the new root image.\n\t\t\t" > - "If format is specified, the snapshot file will\n\t\t\t" > - "be created in that format. Otherwise the\n\t\t\t" > - "snapshot will be internal! (currently unsupported)", > - .mhandler.cmd_new = do_snapshot_blkdev, > + .name = "client_migrate_info", > + .args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?", > + .params = "protocol hostname port tls-port cert-subject", > + .help = "send migration info to spice/vnc client", > + .user_print = monitor_user_noop, > + .mhandler.cmd_new = client_migrate_info, > }, > > STEXI > @@ -842,12 +838,16 @@ new parameters (if specified) once the vm migration finished successfully. > ETEXI > > { > - .name = "client_migrate_info", > - .args_type = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?", > - .params = "protocol hostname port tls-port cert-subject", > - .help = "send migration info to spice/vnc client", > - .user_print = monitor_user_noop, > - .mhandler.cmd_new = client_migrate_info, > + .name = "snapshot_blkdev", > + .args_type = "device:B,snapshot_file:s?,format:s?", > + .params = "device [new-image-file] [format]", > + .help = "initiates a live snapshot\n\t\t\t" > + "of device. If a new image file is specified, the\n\t\t\t" > + "new image file will become the new root image.\n\t\t\t" > + "If format is specified, the snapshot file will\n\t\t\t" > + "be created in that format. Otherwise the\n\t\t\t" > + "snapshot will be internal! (currently unsupported)", > + .mhandler.cmd_new = do_snapshot_blkdev, > }, > > STEXI