NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuhotplugtestcpus: Always use 'query-cpus-fast'

Browse Source 
Use the new command in the test suite by asserting the capability
and adjusting test data to the correct field names as they changed
compared to 'query-cpus'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Peter Krempa
2020-03-04 12:19:39 +01:00
parent b5d8d4b025
commit 7b62dfc737
6 changed files with 491 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
tests/qemuhotplugtestcpus/x86-old-bulk-monitor.json
View File

@@ -1,51 +1,51 @@
{"execute":"query-cpus","id":"libvirt-1"}
{"execute":"query-cpus-fast","id":"libvirt-1"}
{
"return": [
{
"arch": "x86",
"target": "x86",
"current": true,
"CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"cpu-index": 0,
"qom-path": "/machine/unattached/device[0]",
"pc": -2130415978,
"halted": true,
"thread_id": 518291
"thread-id": 518291
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 1,
"qom_path": "/machine/unattached/device[2]",
"cpu-index": 1,
"qom-path": "/machine/unattached/device[2]",
"pc": -2130415978,
"halted": true,
"thread_id": 518292
"thread-id": 518292
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 2,
"qom_path": "/machine/unattached/device[3]",
"cpu-index": 2,
"qom-path": "/machine/unattached/device[3]",
"pc": -2130415978,
"halted": true,
"thread_id": 518294
"thread-id": 518294
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 3,
"qom_path": "/machine/unattached/device[4]",
"cpu-index": 3,
"qom-path": "/machine/unattached/device[4]",
"pc": -2130415978,
"halted": true,
"thread_id": 518295
"thread-id": 518295
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 4,
"qom_path": "/machine/unattached/device[5]",
"cpu-index": 4,
"qom-path": "/machine/unattached/device[5]",
"pc": -2130415978,
"halted": true,
"thread_id": 518296
"thread-id": 518296
}
],
"id": "libvirt-22"
@@ -55,63 +55,63 @@
{"return": {}}
{"execute":"query-cpus","id":"libvirt-3"}
{"execute":"query-cpus-fast","id":"libvirt-3"}
{
"return": [
{
"arch": "x86",
"target": "x86",
"current": true,
"CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"cpu-index": 0,
"qom-path": "/machine/unattached/device[0]",
"pc": -2130415978,
"halted": true,
"thread_id": 518291
"thread-id": 518291
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 1,
"qom_path": "/machine/unattached/device[2]",
"cpu-index": 1,
"qom-path": "/machine/unattached/device[2]",
"pc": -2130415978,
"halted": true,
"thread_id": 518292
"thread-id": 518292
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 2,
"qom_path": "/machine/unattached/device[3]",
"cpu-index": 2,
"qom-path": "/machine/unattached/device[3]",
"pc": -2130415978,
"halted": true,
"thread_id": 518294
"thread-id": 518294
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 3,
"qom_path": "/machine/unattached/device[4]",
"cpu-index": 3,
"qom-path": "/machine/unattached/device[4]",
"pc": -2130415978,
"halted": true,
"thread_id": 518295
"thread-id": 518295
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 4,
"qom_path": "/machine/unattached/device[5]",
"cpu-index": 4,
"qom-path": "/machine/unattached/device[5]",
"pc": -2130415978,
"halted": true,
"thread_id": 518296
"thread-id": 518296
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 5,
"qom_path": "/machine/peripheral/vcpu5",
"cpu-index": 5,
"qom-path": "/machine/peripheral/vcpu5",
"pc": -2130415978,
"halted": true,
"thread_id": 518297
"thread-id": 518297
}
],
"id": "libvirt-22"
@@ -121,72 +121,72 @@
{"return": {}}
{"execute":"query-cpus","id":"libvirt-5"}
{"execute":"query-cpus-fast","id":"libvirt-5"}
{
"return": [
{
"arch": "x86",
"target": "x86",
"current": true,
"CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"cpu-index": 0,
"qom-path": "/machine/unattached/device[0]",
"pc": -2130415978,
"halted": true,
"thread_id": 518291
"thread-id": 518291
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 1,
"qom_path": "/machine/unattached/device[2]",
"cpu-index": 1,
"qom-path": "/machine/unattached/device[2]",
"pc": -2130415978,
"halted": true,
"thread_id": 518292
"thread-id": 518292
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 2,
"qom_path": "/machine/unattached/device[3]",
"cpu-index": 2,
"qom-path": "/machine/unattached/device[3]",
"pc": -2130415978,
"halted": true,
"thread_id": 518294
"thread-id": 518294
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 3,
"qom_path": "/machine/unattached/device[4]",
"cpu-index": 3,
"qom-path": "/machine/unattached/device[4]",
"pc": -2130415978,
"halted": true,
"thread_id": 518295
"thread-id": 518295
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 4,
"qom_path": "/machine/unattached/device[5]",
"cpu-index": 4,
"qom-path": "/machine/unattached/device[5]",
"pc": -2130415978,
"halted": true,
"thread_id": 518296
"thread-id": 518296
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 5,
"qom_path": "/machine/peripheral/vcpu5",
"cpu-index": 5,
"qom-path": "/machine/peripheral/vcpu5",
"pc": -2130415978,
"halted": true,
"thread_id": 518297
"thread-id": 518297
},
{
"arch": "x86",
"target": "x86",
"current": false,
"CPU": 6,
"qom_path": "/machine/peripheral/vcpu6",
"cpu-index": 6,
"qom-path": "/machine/peripheral/vcpu6",
"pc": -2130415978,
"halted": true,
"thread_id": 518298
"thread-id": 518298
}
],
"id": "libvirt-22"