aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJes Sorensen <Jes.Sorensen@redhat.com>2011-03-09 16:54:34 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-03-10 16:12:21 -0600
commit2ea720dba50a4e95a641dd69b0a9864b315868c2 (patch)
tree200114316c60daf6d5102310cf4a3248619b370a
parent7d82af38b78305155553013c6fd709dc50404199 (diff)
hmp-commands.hx: fix badly merged client_migrate_info command
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 <Jes.Sorensen@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hmp-commands.hx32
1 files changed, 16 insertions, 16 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 372bef4290..834e6a8c87 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