Re: [Qemu-devel] [PATCH v2 2/2] qapi: keep names in 'CpuInstanceProperties' in sync with struct CPUCore

[Eric Blake <eblake@redhat.com>]

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

On 06/23/2016 03:23 PM, Peter Krempa wrote:
> struct CPUCore uses 'id' suffix in the property name. As docs for
> query-hotpluggable-cpus state that the cpu core properties should be
> passed back to device_add by management in case new members are added
> and thus the names for the fields should be kept in sync.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
>  hmp.c                 | 16 ++++++++--------
>  hw/ppc/spapr.c        |  4 ++--
>  include/hw/cpu/core.h |  3 +++
>  qapi-schema.json      | 19 ++++++++++---------
>  4 files changed, 23 insertions(+), 19 deletions(-)
> 

> +++ b/qapi-schema.json
> @@ -4267,20 +4267,21 @@
>  # Note: currently there are 4 properties that could be present
>  # but management should be prepared to pass through other
>  # properties with device_add command to allow for future
> -# interface extension.
> +# interface extension. This also requires the filed names to be kept in sync
> +# sync with the properties passed to -device/device_add.

s/sync sync/sync/

>  #
> -# @node: #optional NUMA node ID the CPU belongs to
> -# @socket: #optional socket number within node/board the CPU belongs to
> -# @core: #optional core number within socket the CPU belongs to
> -# @thread: #optional thread number within core the CPU belongs to
> +# @node-id: #optional NUMA node ID the CPU belongs to
> +# @socket-id: #optional socket number within node/board the CPU belongs to
> +# @core-id: #optional core number within socket the CPU belongs to
> +# @thread-id: #optional thread number within core the CPU belongs to
>  #
>  # Since: 2.7
>  ##
>  { 'struct': 'CpuInstanceProperties',
> -  'data': { '*node': 'int',
> -            '*socket': 'int',
> -            '*core': 'int',
> -            '*thread': 'int'
> +  'data': { '*node-id': 'int',
> +            '*socket-id': 'int',
> +            '*core-id': 'int',
> +            '*thread-id': 'int'
>    }
>  }
> 

with the duplicate word fixed,
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: 604 bytes --]