From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=40342 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PxLiv-0005A8-El for qemu-devel@nongnu.org; Wed, 09 Mar 2011 10:54:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PxLit-0002En-0t for qemu-devel@nongnu.org; Wed, 09 Mar 2011 10:54:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28888) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PxLis-0002Eh-J0 for qemu-devel@nongnu.org; Wed, 09 Mar 2011 10:54:50 -0500 From: Jes.Sorensen@redhat.com Date: Wed, 9 Mar 2011 16:54:34 +0100 Message-Id: <1299686074-25719-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [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: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com From: Jes Sorensen client_migrate_info was merged badly, 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 --- 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 -- 1.7.4