aboutsummaryrefslogtreecommitdiff
path: root/qapi/machine.json
diff options
context:
space:
mode:
authorLike Xu <like.xu@linux.intel.com>2019-06-12 16:40:58 +0800
committerEduardo Habkost <ehabkost@redhat.com>2019-07-05 17:08:03 -0300
commit176d2cda0dee9f4f78f604ad72d6a111e8e38f3b (patch)
tree57db8dcefd1a3899e570cb1f07e5e0360d54ae39 /qapi/machine.json
parentcabea7dcd0e2084bdd32fcfe54f6275599f55bb7 (diff)
downloadqemu-176d2cda0dee9f4f78f604ad72d6a111e8e38f3b.zip
qemu-176d2cda0dee9f4f78f604ad72d6a111e8e38f3b.tar.gz
qemu-176d2cda0dee9f4f78f604ad72d6a111e8e38f3b.tar.bz2
i386/cpu: Consolidate die-id validity in smp context
The field die_id (default as 0) and has_die_id are introduced to X86CPU. Following the legacy smp check rules, the die_id validity is added to the same contexts as leagcy smp variables such as hmp_hotpluggable_cpus(), machine_set_cpu_numa_node(), cpu_slot_to_string() and pc_cpu_pre_plug(). Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Like Xu <like.xu@linux.intel.com> Message-Id: <20190612084104.34984-4-like.xu@linux.intel.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'qapi/machine.json')
-rw-r--r--qapi/machine.json7
1 files changed, 4 insertions, 3 deletions
diff --git a/qapi/machine.json b/qapi/machine.json
index 81849ac..979bc41 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -588,10 +588,10 @@
#
# @node-id: NUMA node ID the CPU belongs to
# @socket-id: socket number within node/board the CPU belongs to
-# @core-id: core number within socket the CPU belongs to
-# @thread-id: thread number within core the CPU belongs to
+# @die-id: die number within node/board the CPU belongs to (Since 4.1)
+# @core-id: core number within die the CPU belongs to# @thread-id: thread number within core the CPU belongs to
#
-# Note: currently there are 4 properties that could be present
+# Note: currently there are 5 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. This also requires the filed names to be kept in
@@ -602,6 +602,7 @@
{ 'struct': 'CpuInstanceProperties',
'data': { '*node-id': 'int',
'*socket-id': 'int',
+ '*die-id': 'int',
'*core-id': 'int',
'*thread-id': 'int'
}