| Message ID | 61d5b28a8a8e540a111e5bb6814d8082f1d69dda.1466716710.git.pkrempa@redhat.com |
|---|---|
| State | New |
| Headers | show |
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>
On Thu, 23 Jun 2016 23:23:34 +0200 Peter Krempa <pkrempa@redhat.com> 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(-) > > diff --git a/hmp.c b/hmp.c > index 997a768..925601a 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -2457,17 +2457,17 @@ void hmp_hotpluggable_cpus(Monitor *mon, > const QDict *qdict) > > c = l->value->props; > monitor_printf(mon, " CPUInstance Properties:\n"); > - if (c->has_node) { > - monitor_printf(mon, " node: \"%" PRIu64 "\"\n", > c->node); > + if (c->has_node_id) { > + monitor_printf(mon, " node-id: \"%" PRIu64 "\"\n", > c->node_id); } > - if (c->has_socket) { > - monitor_printf(mon, " socket: \"%" PRIu64 "\"\n", > c->socket); > + if (c->has_socket_id) { > + monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n", > c->socket_id); } > - if (c->has_core) { > - monitor_printf(mon, " core: \"%" PRIu64 "\"\n", > c->core); > + if (c->has_core_id) { > + monitor_printf(mon, " core-id: \"%" PRIu64 "\"\n", > c->core_id); } > - if (c->has_thread) { > - monitor_printf(mon, " thread: \"%" PRIu64 "\"\n", > c->thread); > + if (c->has_thread_id) { > + monitor_printf(mon, " thread-id: \"%" PRIu64 "\"\n", > c->thread_id); } > > l = l->next; > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 778fa25..0b6bb9c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -2367,8 +2367,8 @@ static HotpluggableCPUList > *spapr_query_hotpluggable_cpus(MachineState *machine) > > cpu_item->type = spapr_get_cpu_core_type(machine->cpu_model); > cpu_item->vcpus_count = smp_threads; > - cpu_props->has_core = true; > - cpu_props->core = i * smt; > + cpu_props->has_core_id = true; > + cpu_props->core_id = i * smt; > /* TODO: add 'has_node/node' here to describe > to which node core belongs */ > > diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h > index 4540a7d..79ac79c 100644 > --- a/include/hw/cpu/core.h > +++ b/include/hw/cpu/core.h > @@ -26,6 +26,9 @@ typedef struct CPUCore { > int nr_threads; > } CPUCore; > > +/* Note: topology field names need to be kept in sync with > + * 'CpuInstanceProperties' */ > + > #define CPU_CORE_PROP_CORE_ID "core-id" > > #endif > diff --git a/qapi-schema.json b/qapi-schema.json > index 24ede28..d0c4be1 100644 > --- a/qapi-schema.json > +++ 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. > # > -# @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' > } > } > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
diff --git a/hmp.c b/hmp.c index 997a768..925601a 100644 --- a/hmp.c +++ b/hmp.c @@ -2457,17 +2457,17 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) c = l->value->props; monitor_printf(mon, " CPUInstance Properties:\n"); - if (c->has_node) { - monitor_printf(mon, " node: \"%" PRIu64 "\"\n", c->node); + if (c->has_node_id) { + monitor_printf(mon, " node-id: \"%" PRIu64 "\"\n", c->node_id); } - if (c->has_socket) { - monitor_printf(mon, " socket: \"%" PRIu64 "\"\n", c->socket); + if (c->has_socket_id) { + monitor_printf(mon, " socket-id: \"%" PRIu64 "\"\n", c->socket_id); } - if (c->has_core) { - monitor_printf(mon, " core: \"%" PRIu64 "\"\n", c->core); + if (c->has_core_id) { + monitor_printf(mon, " core-id: \"%" PRIu64 "\"\n", c->core_id); } - if (c->has_thread) { - monitor_printf(mon, " thread: \"%" PRIu64 "\"\n", c->thread); + if (c->has_thread_id) { + monitor_printf(mon, " thread-id: \"%" PRIu64 "\"\n", c->thread_id); } l = l->next; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 778fa25..0b6bb9c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2367,8 +2367,8 @@ static HotpluggableCPUList *spapr_query_hotpluggable_cpus(MachineState *machine) cpu_item->type = spapr_get_cpu_core_type(machine->cpu_model); cpu_item->vcpus_count = smp_threads; - cpu_props->has_core = true; - cpu_props->core = i * smt; + cpu_props->has_core_id = true; + cpu_props->core_id = i * smt; /* TODO: add 'has_node/node' here to describe to which node core belongs */ diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h index 4540a7d..79ac79c 100644 --- a/include/hw/cpu/core.h +++ b/include/hw/cpu/core.h @@ -26,6 +26,9 @@ typedef struct CPUCore { int nr_threads; } CPUCore; +/* Note: topology field names need to be kept in sync with + * 'CpuInstanceProperties' */ + #define CPU_CORE_PROP_CORE_ID "core-id" #endif diff --git a/qapi-schema.json b/qapi-schema.json index 24ede28..d0c4be1 100644 --- a/qapi-schema.json +++ 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. # -# @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' } }
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(-)