[Qemu-devel] [PATCH] qmp-commands.hx: Clean up mess of client_migrate_info

[Qemu-devel] [PATCH] qmp-commands.hx: Clean up mess of client_migrate_info

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

client_migrate_info was put into qmp-commands.hx in the middle of
migrate_set_speed, between the command and it's description. In
addition client_migrate_info put the description before the command
itself, which is the wrong order.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 qmp-commands.hx |   68 +++++++++++++++++++++++++++---------------------------
 1 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/qmp-commands.hx b/qmp-commands.hx
index df40a3d..9d3cc31 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -503,79 +503,79 @@ EQMP
     },
 
 SQMP
-client_migrate_info
-------------------
+migrate_set_speed
+-----------------
 
-Set the spice/vnc connection info for the migration target.  The spice/vnc
-server will ask the spice/vnc client to automatically reconnect using the
-new parameters (if specified) once the vm migration finished successfully.
+Set maximum speed for migrations.
 
 Arguments:
 
-- "protocol":     protocol: "spice" or "vnc" (json-string)
-- "hostname":     migration target hostname (json-string)
-- "port":         spice/vnc tcp port for plaintext channels (json-int, optional)
-- "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
-- "cert-subject": server certificate subject (json-string, optional)
+- "value": maximum speed, in bytes per second (json-int)
 
 Example:
 
--> { "execute": "client_migrate_info",
-     "arguments": { "protocol": "spice",
-                    "hostname": "virt42.lab.kraxel.org",
-                    "port": 1234 } }
+-> { "execute": "migrate_set_speed", "arguments": { "value": 1024 } }
 <- { "return": {} }
 
 EQMP
 
     {
-        .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",
+        .name       = "migrate_set_downtime",
+        .args_type  = "value:T",
+        .params     = "value",
+        .help       = "set maximum tolerated downtime (in seconds) for migrations",
         .user_print = monitor_user_noop,
-        .mhandler.cmd_new = client_migrate_info,
+        .mhandler.cmd_new = do_migrate_set_downtime,
     },
 
 SQMP
-migrate_set_speed
------------------
+migrate_set_downtime
+--------------------
 
-Set maximum speed for migrations.
+Set maximum tolerated downtime (in seconds) for migrations.
 
 Arguments:
 
-- "value": maximum speed, in bytes per second (json-int)
+- "value": maximum downtime (json-number)
 
 Example:
 
--> { "execute": "migrate_set_speed", "arguments": { "value": 1024 } }
+-> { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }
 <- { "return": {} }
 
 EQMP
 
     {
-        .name       = "migrate_set_downtime",
-        .args_type  = "value:T",
-        .params     = "value",
-        .help       = "set maximum tolerated downtime (in seconds) for migrations",
+        .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 = do_migrate_set_downtime,
+        .mhandler.cmd_new = client_migrate_info,
     },
 
 SQMP
-migrate_set_downtime
---------------------
+client_migrate_info
+------------------
 
-Set maximum tolerated downtime (in seconds) for migrations.
+Set the spice/vnc connection info for the migration target.  The spice/vnc
+server will ask the spice/vnc client to automatically reconnect using the
+new parameters (if specified) once the vm migration finished successfully.
 
 Arguments:
 
-- "value": maximum downtime (json-number)
+- "protocol":     protocol: "spice" or "vnc" (json-string)
+- "hostname":     migration target hostname (json-string)
+- "port":         spice/vnc tcp port for plaintext channels (json-int, optional)
+- "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
+- "cert-subject": server certificate subject (json-string, optional)
 
 Example:
 
--> { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }
+-> { "execute": "client_migrate_info",
+     "arguments": { "protocol": "spice",
+                    "hostname": "virt42.lab.kraxel.org",
+                    "port": 1234 } }
 <- { "return": {} }
 
 EQMP
-- 
1.7.4

Re: [Qemu-devel] [PATCH] qmp-commands.hx: Clean up mess of client_migrate_info

[Anthony Liguori]

On 03/09/2011 07:31 AM, Jes.Sorensen@redhat.com wrote:
> From: Jes Sorensen<Jes.Sorensen@redhat.com>
>
> client_migrate_info was put into qmp-commands.hx in the middle of
> migrate_set_speed, between the command and it's description. In
> addition client_migrate_info put the description before the command
> itself, which is the wrong order.
>
> Signed-off-by: Jes Sorensen<Jes.Sorensen@redhat.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   qmp-commands.hx |   68 +++++++++++++++++++++++++++---------------------------
>   1 files changed, 34 insertions(+), 34 deletions(-)
>
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index df40a3d..9d3cc31 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -503,79 +503,79 @@ EQMP
>       },
>
>   SQMP
> -client_migrate_info
> -------------------
> +migrate_set_speed
> +-----------------
>
> -Set the spice/vnc connection info for the migration target.  The spice/vnc
> -server will ask the spice/vnc client to automatically reconnect using the
> -new parameters (if specified) once the vm migration finished successfully.
> +Set maximum speed for migrations.
>
>   Arguments:
>
> -- "protocol":     protocol: "spice" or "vnc" (json-string)
> -- "hostname":     migration target hostname (json-string)
> -- "port":         spice/vnc tcp port for plaintext channels (json-int, optional)
> -- "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
> -- "cert-subject": server certificate subject (json-string, optional)
> +- "value": maximum speed, in bytes per second (json-int)
>
>   Example:
>
> -->  { "execute": "client_migrate_info",
> -     "arguments": { "protocol": "spice",
> -                    "hostname": "virt42.lab.kraxel.org",
> -                    "port": 1234 } }
> +->  { "execute": "migrate_set_speed", "arguments": { "value": 1024 } }
>   <- { "return": {} }
>
>   EQMP
>
>       {
> -        .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",
> +        .name       = "migrate_set_downtime",
> +        .args_type  = "value:T",
> +        .params     = "value",
> +        .help       = "set maximum tolerated downtime (in seconds) for migrations",
>           .user_print = monitor_user_noop,
> -        .mhandler.cmd_new = client_migrate_info,
> +        .mhandler.cmd_new = do_migrate_set_downtime,
>       },
>
>   SQMP
> -migrate_set_speed
> ------------------
> +migrate_set_downtime
> +--------------------
>
> -Set maximum speed for migrations.
> +Set maximum tolerated downtime (in seconds) for migrations.
>
>   Arguments:
>
> -- "value": maximum speed, in bytes per second (json-int)
> +- "value": maximum downtime (json-number)
>
>   Example:
>
> -->  { "execute": "migrate_set_speed", "arguments": { "value": 1024 } }
> +->  { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }
>   <- { "return": {} }
>
>   EQMP
>
>       {
> -        .name       = "migrate_set_downtime",
> -        .args_type  = "value:T",
> -        .params     = "value",
> -        .help       = "set maximum tolerated downtime (in seconds) for migrations",
> +        .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 = do_migrate_set_downtime,
> +        .mhandler.cmd_new = client_migrate_info,
>       },
>
>   SQMP
> -migrate_set_downtime
> ---------------------
> +client_migrate_info
> +------------------
>
> -Set maximum tolerated downtime (in seconds) for migrations.
> +Set the spice/vnc connection info for the migration target.  The spice/vnc
> +server will ask the spice/vnc client to automatically reconnect using the
> +new parameters (if specified) once the vm migration finished successfully.
>
>   Arguments:
>
> -- "value": maximum downtime (json-number)
> +- "protocol":     protocol: "spice" or "vnc" (json-string)
> +- "hostname":     migration target hostname (json-string)
> +- "port":         spice/vnc tcp port for plaintext channels (json-int, optional)
> +- "tls-port":     spice tcp port for tls-secured channels (json-int, optional)
> +- "cert-subject": server certificate subject (json-string, optional)
>
>   Example:
>
> -->  { "execute": "migrate_set_downtime", "arguments": { "value": 0.1 } }
> +->  { "execute": "client_migrate_info",
> +     "arguments": { "protocol": "spice",
> +                    "hostname": "virt42.lab.kraxel.org",
> +                    "port": 1234 } }
>   <- { "return": {} }
>
>   EQMP