[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/3] [VARIANT 1] qapi: Change 'core' to 'core-id' in
From: |
Peter Krempa |
Subject: |
[Qemu-devel] [PATCH 2/3] [VARIANT 1] qapi: Change 'core' to 'core-id' in 'CpuInstanceProperties' |
Date: |
Thu, 23 Jun 2016 22:23:24 +0200 |
struct CPUCore uses 'core-id' as 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 <address@hidden>
---
hmp.c | 4 ++--
hw/ppc/spapr.c | 4 ++--
include/hw/cpu/core.h | 3 +++
qapi-schema.json | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hmp.c b/hmp.c
index 997a768..543f087 100644
--- a/hmp.c
+++ b/hmp.c
@@ -2463,8 +2463,8 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict
*qdict)
if (c->has_socket) {
monitor_printf(mon, " socket: \"%" PRIu64 "\"\n", c->socket);
}
- if (c->has_core) {
- monitor_printf(mon, " core: \"%" PRIu64 "\"\n", c->core);
+ if (c->has_core_id) {
+ monitor_printf(mon, " core: \"%" PRIu64 "\"\n", c->core_id);
}
if (c->has_thread) {
monitor_printf(mon, " thread: \"%" PRIu64 "\"\n", c->thread);
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..37ef5fd 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4271,7 +4271,7 @@
#
# @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
+# @core-id: #optional core number within socket the CPU belongs to
# @thread: #optional thread number within core the CPU belongs to
#
# Since: 2.7
@@ -4279,7 +4279,7 @@
{ 'struct': 'CpuInstanceProperties',
'data': { '*node': 'int',
'*socket': 'int',
- '*core': 'int',
+ '*core-id': 'int',
'*thread': 'int'
}
}
--
2.8.3
- [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, (continued)
- [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Peter Krempa, 2016/06/23
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Eric Blake, 2016/06/23
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, David Gibson, 2016/06/23
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Eric Blake, 2016/06/23
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, David Gibson, 2016/06/24
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Igor Mammedov, 2016/06/24
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Peter Krempa, 2016/06/24
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, David Gibson, 2016/06/24
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, Peter Krempa, 2016/06/24
- Re: [Qemu-devel] [PATCH 1/3] qapi: Report support for -device cpu hotplug in query-machines, David Gibson, 2016/06/26
[Qemu-devel] [PATCH 2/3] [VARIANT 1] qapi: Change 'core' to 'core-id' in 'CpuInstanceProperties',
Peter Krempa <=
[Qemu-devel] [PATCH 3/3] [VARIANT 2] qapi: Change 'core-id' to 'core' in 'struct CPUCore', Peter Krempa, 2016/06/23