openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
libvirt/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86...

88 lines
1.6 KiB
JSON
Raw Normal View History

qemu: domain: Use vcpu 'node-id' property and pass it back to qemu vcpu properties gathered from query-hotpluggable cpus need to be passed back to qemu. As qemu did not use the node-id property until now and libvirt forgot to pass it back properly (it was parsed but not passed around) we did not honor this. This patch adds node-id to the structures where it was missing and passes it around as necessary. The test data was generated with a VM with following config: <numa> <cell id='0' cpus='0,2,4,6' memory='512000' unit='KiB'/> <cell id='1' cpus='1,3,5,7' memory='512000' unit='KiB'/> </numa> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452053
2017-06-27 22:04:38 +08:00
{
"return": [
{
"props": {
"core-id": 1,
"thread-id": 1,
"node-id": 1,
"socket-id": 1
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 1,
"thread-id": 0,
"node-id": 0,
"socket-id": 1
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 0,
"thread-id": 1,
"node-id": 1,
"socket-id": 1
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 0,
"thread-id": 0,
"node-id": 0,
"socket-id": 1
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 1,
"thread-id": 1,
"node-id": 1,
"socket-id": 0
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 1,
"thread-id": 0,
"node-id": 0,
"socket-id": 0
},
"vcpus-count": 1,
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 0,
"thread-id": 1,
"node-id": 1,
"socket-id": 0
},
"vcpus-count": 1,
"qom-path": "/machine/unattached/device[2]",
"type": "Broadwell-x86_64-cpu"
},
{
"props": {
"core-id": 0,
"thread-id": 0,
"node-id": 0,
"socket-id": 0
},
"vcpus-count": 1,
"qom-path": "/machine/unattached/device[0]",
"type": "Broadwell-x86_64-cpu"
}
],
"id": "libvirt-20"
}