[Qemu-devel] [PATCH] qmp: update send-key document

[Qemu-devel] [PATCH] qmp: update send-key document

[Amos Kong]

commit 9f328977 changes qmp_send_key() to accept key codes in hex,
but the document wasn't updated. The items of keys list is union
now, not enum.

Signed-off-by: Amos Kong <akong@redhat.com>
---
 qmp-commands.hx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/qmp-commands.hx b/qmp-commands.hx
index e3cbe93..30f9fc9 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -346,7 +346,8 @@ Send keys to VM.
 Arguments:
 
 keys array:
-    - "key": key sequence (a json-array of key enum values)
+    - "key": key sequence (a json-array of key union values,
+             union can be number or qcode enum)
 
 - hold-time: time to delay key up events, milliseconds. Defaults to 100
              (json-int, optional)
@@ -354,7 +355,9 @@ keys array:
 Example:
 
 -> { "execute": "send-key",
-     "arguments": { 'keys': [ 'ctrl', 'alt', 'delete' ] } }
+     "arguments": { "keys": [ { "type": "qcode", "data": "ctrl" },
+                              { "type": "qcode", "data": "alt" },
+                              { "type": "qcode", "data": "delete" } ] } }
 <- { "return": {} }
 
 EQMP
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] qmp: update send-key document

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On 07/16/2013 05:52 AM, Amos Kong wrote:
> commit 9f328977 changes qmp_send_key() to accept key codes in hex,
> but the document wasn't updated. The items of keys list is union
> now, not enum.
> 
> Signed-off-by: Amos Kong <akong@redhat.com>
> ---
>  qmp-commands.hx | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

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

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 621 bytes --]

Re: [Qemu-devel] [PATCH] qmp: update send-key document

[Luiz Capitulino]

On Tue, 16 Jul 2013 19:52:14 +0800
Amos Kong <akong@redhat.com> wrote:

> commit 9f328977 changes qmp_send_key() to accept key codes in hex,
> but the document wasn't updated. The items of keys list is union
> now, not enum.
> 
> Signed-off-by: Amos Kong <akong@redhat.com>

Applied to the qmp branch, thanks.

> ---
>  qmp-commands.hx | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index e3cbe93..30f9fc9 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -346,7 +346,8 @@ Send keys to VM.
>  Arguments:
>  
>  keys array:
> -    - "key": key sequence (a json-array of key enum values)
> +    - "key": key sequence (a json-array of key union values,
> +             union can be number or qcode enum)
>  
>  - hold-time: time to delay key up events, milliseconds. Defaults to 100
>               (json-int, optional)
> @@ -354,7 +355,9 @@ keys array:
>  Example:
>  
>  -> { "execute": "send-key",
> -     "arguments": { 'keys': [ 'ctrl', 'alt', 'delete' ] } }
> +     "arguments": { "keys": [ { "type": "qcode", "data": "ctrl" },
> +                              { "type": "qcode", "data": "alt" },
> +                              { "type": "qcode", "data": "delete" } ] } }
>  <- { "return": {} }
>  
>  EQMP