[Qemu-devel] Re: [PATCH] hmp-commands.hx: fix badly merged client_migrate_info command

[Anthony Liguori]

On 03/09/2011 09:54 AM, address@hidden wrote:
> From: Jes Sorensen<address@hidden>
>
> 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<address@hidden>

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