diff mbox

[PATCHv2] qmp: fix integer usage in examples

Message ID 1377895451-6603-1-git-send-email-eblake@redhat.com
State New
Headers show

Commit Message

Eric Blake Aug. 30, 2013, 8:44 p.m. UTC
Per the qapi schema, block_set_io_throttle takes most arguments
as ints, not strings.

* qmp-commands.hx (block_set_io_throttle): Use correct type.  Fix
whitespace and a copy-paste bug in the process.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

v2: also touch up the doc comments

 qmp-commands.hx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Comments

Benoît Canet Aug. 30, 2013, 9:47 p.m. UTC | #1
Le Friday 30 Aug 2013 à 14:44:11 (-0600), Eric Blake a écrit :
> Per the qapi schema, block_set_io_throttle takes most arguments
> as ints, not strings.
> 
> * qmp-commands.hx (block_set_io_throttle): Use correct type.  Fix
> whitespace and a copy-paste bug in the process.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>
> ---
> 
> v2: also touch up the doc comments
> 
>  qmp-commands.hx | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index bb09e72..8a8f342 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -1402,22 +1402,22 @@ Change I/O throttle limits for a block drive.
>  Arguments:
> 
>  - "device": device name (json-string)
> -- "bps":  total throughput limit in bytes per second(json-int)
> -- "bps_rd":  read throughput limit in bytes per second(json-int)
> -- "bps_wr":  read throughput limit in bytes per second(json-int)
> -- "iops":  total I/O operations per second(json-int)
> -- "iops_rd":  read I/O operations per second(json-int)
> -- "iops_wr":  write I/O operations per second(json-int)
> +- "bps": total throughput limit in bytes per second (json-int)
> +- "bps_rd": read throughput limit in bytes per second (json-int)
> +- "bps_wr": write throughput limit in bytes per second (json-int)
> +- "iops": total I/O operations per second (json-int)
> +- "iops_rd": read I/O operations per second (json-int)
> +- "iops_wr": write I/O operations per second (json-int)
> 
>  Example:
> 
>  -> { "execute": "block_set_io_throttle", "arguments": { "device": "virtio0",
> -                                               "bps": "1000000",
> -                                               "bps_rd": "0",
> -                                               "bps_wr": "0",
> -                                               "iops": "0",
> -                                               "iops_rd": "0",
> -                                               "iops_wr": "0" } }
> +                                               "bps": 1000000,
> +                                               "bps_rd": 0,
> +                                               "bps_wr": 0,
> +                                               "iops": 0,
> +                                               "iops_rd": 0,
> +                                               "iops_wr": 0 } }
>  <- { "return": {} }
> 
>  EQMP
> @@ -1791,7 +1791,7 @@ Each json-object contain the following:
>                   - "vm-state-size": size of the VM state in bytes (json-int)
>                   - "date-sec": UTC date of the snapshot in seconds (json-int)
>                   - "date-nsec": fractional part in nanoseconds to be used with
> -                                date-sec(json-int)
> +                                date-sec (json-int)
>                   - "vm-clock-sec": VM clock relative to boot in seconds
>                                     (json-int)
>                   - "vm-clock-nsec": fractional part in nanoseconds to be used
> -- 
> 1.8.3.1
> 

Reviewed-by: Benoit Canet <benoit@irqsave.net>
Michael Tokarev Sept. 1, 2013, 3:47 p.m. UTC | #2
31.08.2013 00:44, Eric Blake wrote:
> Per the qapi schema, block_set_io_throttle takes most arguments
> as ints, not strings.
>
> * qmp-commands.hx (block_set_io_throttle): Use correct type.  Fix
> whitespace and a copy-paste bug in the process.

Thanks, applied to the trivial-patches queue.

/mjt
diff mbox

Patch

diff --git a/qmp-commands.hx b/qmp-commands.hx
index bb09e72..8a8f342 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1402,22 +1402,22 @@  Change I/O throttle limits for a block drive.
 Arguments:

 - "device": device name (json-string)
-- "bps":  total throughput limit in bytes per second(json-int)
-- "bps_rd":  read throughput limit in bytes per second(json-int)
-- "bps_wr":  read throughput limit in bytes per second(json-int)
-- "iops":  total I/O operations per second(json-int)
-- "iops_rd":  read I/O operations per second(json-int)
-- "iops_wr":  write I/O operations per second(json-int)
+- "bps": total throughput limit in bytes per second (json-int)
+- "bps_rd": read throughput limit in bytes per second (json-int)
+- "bps_wr": write throughput limit in bytes per second (json-int)
+- "iops": total I/O operations per second (json-int)
+- "iops_rd": read I/O operations per second (json-int)
+- "iops_wr": write I/O operations per second (json-int)

 Example:

 -> { "execute": "block_set_io_throttle", "arguments": { "device": "virtio0",
-                                               "bps": "1000000",
-                                               "bps_rd": "0",
-                                               "bps_wr": "0",
-                                               "iops": "0",
-                                               "iops_rd": "0",
-                                               "iops_wr": "0" } }
+                                               "bps": 1000000,
+                                               "bps_rd": 0,
+                                               "bps_wr": 0,
+                                               "iops": 0,
+                                               "iops_rd": 0,
+                                               "iops_wr": 0 } }
 <- { "return": {} }

 EQMP
@@ -1791,7 +1791,7 @@  Each json-object contain the following:
                  - "vm-state-size": size of the VM state in bytes (json-int)
                  - "date-sec": UTC date of the snapshot in seconds (json-int)
                  - "date-nsec": fractional part in nanoseconds to be used with
-                                date-sec(json-int)
+                                date-sec (json-int)
                  - "vm-clock-sec": VM clock relative to boot in seconds
                                    (json-int)
                  - "vm-clock-nsec": fractional part in nanoseconds to be used