On 05/05/15 09:02, Eric Blake wrote:
> On 04/30/2015 12:20 PM, Don Slutz wrote:
>> This adds one new inject command:
>>
>> inject-vmport-action
>>
>> And three guest info commands:
>>
>> vmport-guestinfo-set
>> vmport-guestinfo-get
>> query-vmport-guestinfo
>>
>> More details in qmp-commands.hx
>>
>> Signed-off-by: Don Slutz <dsl...@verizon.com>
>> ---
>
>> +++ b/qapi-schema.json
>> @@ -1295,6 +1295,96 @@
>> { 'command': 'inject-nmi' }
>>
>
>> +##
>> +# @vmport-guestinfo-get:
>> +#
>> +# Get a VMWare Tools guestinfo value for a key
>> +#
>> +# @key: the key to get
>> +#
>> +# @format: #optional data encoding (default 'utf8').
>> +# - base64: the value is returned in base64 encoding.
>> +# - utf8: the value is interpreted as UTF-8.
>> +#
>> +# Returns: value for the guest info key
>> +#
>> +# Since: 2.4
>> +##
>> +{ 'command': 'vmport-guestinfo-get',
>> + 'data': {'key': 'str', '*format': 'DataFormat'},
>> + 'returns': 'str' }
>
> Returning a non-dictionary is not extensible. Once my qapi nested
> struct series is applied, you'd have to modify the whitelist to allow
> this command. Better would be to return things in a dictionary, as in:
>
> { 'command': 'vmport-guestinfo-get',
> 'data': {'key': 'str', '*format': 'DataFormat'},
> 'returns': {'data':'str'} }
>
Will change to something like this.
>> +
>> +##
>> +# @VmportGuestInfo:
>> +#
>> +# Information about a single VMWare Tools guestinfo
>> +#
>> +# @key: The known key
>> +#
>> +# Since: 2.4
>> +##
>> +{ 'type': 'VmportGuestInfo', 'data': {'key': 'str'} }
>
> Also, once my series is in, you'll need to s/type/struct/
>
>
Looks like your series is in, adjusting.
>> +++ b/qmp-commands.hx
>> @@ -490,6 +490,126 @@ Note: inject-nmi fails when the guest doesn't support
>> injecting.
>> EQMP
>>
>> {
>> + .name = "inject-vmport-action",
>> + .args_type = "action:s",
>> + .mhandler.cmd_new = qmp_marshal_input_inject_vmport_action,
>> + },
>> +
>> +SQMP
>> +inject-vmport-action
>> +----------
>
> Cosmetic, but the majority of the file matches the length of the -----
> to the command it is underlining.
>
>
Will Do
>> +
>> +-> { "execute": "vmport-guestinfo-get",
>> + "arguments": { "key": "foo",
>> + "format": "utf8" } }
>> +<- {"return": "abcdefgh"}
>
> Again, I don't like the notion of returning a non-dictionary without
> good cause.
>
>
Will adjust.
>> +-> { "execute": "query-vmport-guestinfo" }
>> +<- {
>> + "return": [
>> + {
>> + "key": "ip",
>> + },
>
> Invalid JSON - no trailing commas allowed in the objects.
>
Will Fix
-Don Slutz
signature.asc
Description: OpenPGP digital signature
