mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-10 05:17:59 +03:00
qemuhotplugtest: Remove tests for legacy cpu hotplug on x86
Modern cpu hotplug was introduced in qemu-2.7, thus all qemu versions actually support it. Remove the tests for the legacy hotplug. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
parent
a1ef0b129a
commit
4b1199a5c4
@ -874,7 +874,6 @@ mymain(void)
|
|||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
DO_TEST_CPU_GROUP("x86-modern-bulk", 7, true, false);
|
DO_TEST_CPU_GROUP("x86-modern-bulk", 7, true, false);
|
||||||
DO_TEST_CPU_GROUP("x86-old-bulk", 7, false, false);
|
|
||||||
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 24, true, false);
|
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 24, true, false);
|
||||||
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 15, true, true);
|
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 15, true, true);
|
||||||
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 23, true, true);
|
DO_TEST_CPU_GROUP("ppc64-modern-bulk", 23, true, true);
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory unit='KiB'>219100</memory>
|
|
||||||
<currentMemory unit='KiB'>219100</currentMemory>
|
|
||||||
<vcpu placement='static' current='5'>8</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='x86_64' machine='pc'>hvm</type>
|
|
||||||
<boot dev='network'/>
|
|
||||||
</os>
|
|
||||||
<cpu>
|
|
||||||
<topology sockets="4" cores="2" threads="1"/>
|
|
||||||
</cpu>
|
|
||||||
<clock offset='utc'/>
|
|
||||||
<on_poweroff>destroy</on_poweroff>
|
|
||||||
<on_reboot>restart</on_reboot>
|
|
||||||
<on_crash>destroy</on_crash>
|
|
||||||
<devices>
|
|
||||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
||||||
@ -1,193 +0,0 @@
|
|||||||
{"execute":"query-cpus-fast","id":"libvirt-1"}
|
|
||||||
|
|
||||||
{
|
|
||||||
"return": [
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": true,
|
|
||||||
"cpu-index": 0,
|
|
||||||
"qom-path": "/machine/unattached/device[0]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518291
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 1,
|
|
||||||
"qom-path": "/machine/unattached/device[2]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518292
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 2,
|
|
||||||
"qom-path": "/machine/unattached/device[3]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518294
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 3,
|
|
||||||
"qom-path": "/machine/unattached/device[4]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518295
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 4,
|
|
||||||
"qom-path": "/machine/unattached/device[5]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518296
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"id": "libvirt-22"
|
|
||||||
}
|
|
||||||
|
|
||||||
{"execute":"cpu-add","arguments":{"id":5},"id":"libvirt-2"}
|
|
||||||
|
|
||||||
{"return": {}}
|
|
||||||
|
|
||||||
{"execute":"query-cpus-fast","id":"libvirt-3"}
|
|
||||||
|
|
||||||
{
|
|
||||||
"return": [
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": true,
|
|
||||||
"cpu-index": 0,
|
|
||||||
"qom-path": "/machine/unattached/device[0]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518291
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 1,
|
|
||||||
"qom-path": "/machine/unattached/device[2]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518292
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 2,
|
|
||||||
"qom-path": "/machine/unattached/device[3]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518294
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 3,
|
|
||||||
"qom-path": "/machine/unattached/device[4]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518295
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 4,
|
|
||||||
"qom-path": "/machine/unattached/device[5]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518296
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 5,
|
|
||||||
"qom-path": "/machine/peripheral/vcpu5",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518297
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"id": "libvirt-22"
|
|
||||||
}
|
|
||||||
|
|
||||||
{"execute":"cpu-add","arguments":{"id":6},"id":"libvirt-4"}
|
|
||||||
|
|
||||||
{"return": {}}
|
|
||||||
|
|
||||||
{"execute":"query-cpus-fast","id":"libvirt-5"}
|
|
||||||
|
|
||||||
{
|
|
||||||
"return": [
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": true,
|
|
||||||
"cpu-index": 0,
|
|
||||||
"qom-path": "/machine/unattached/device[0]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518291
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 1,
|
|
||||||
"qom-path": "/machine/unattached/device[2]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518292
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 2,
|
|
||||||
"qom-path": "/machine/unattached/device[3]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518294
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 3,
|
|
||||||
"qom-path": "/machine/unattached/device[4]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518295
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 4,
|
|
||||||
"qom-path": "/machine/unattached/device[5]",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518296
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 5,
|
|
||||||
"qom-path": "/machine/peripheral/vcpu5",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518297
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"target": "x86",
|
|
||||||
"current": false,
|
|
||||||
"cpu-index": 6,
|
|
||||||
"qom-path": "/machine/peripheral/vcpu6",
|
|
||||||
"pc": -2130415978,
|
|
||||||
"halted": true,
|
|
||||||
"thread-id": 518298
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"id": "libvirt-22"
|
|
||||||
}
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory unit='KiB'>219100</memory>
|
|
||||||
<currentMemory unit='KiB'>219100</currentMemory>
|
|
||||||
<vcpu placement='static' current='7'>8</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='x86_64' machine='pc'>hvm</type>
|
|
||||||
<boot dev='network'/>
|
|
||||||
</os>
|
|
||||||
<cpu>
|
|
||||||
<topology sockets='4' dies='1' cores='2' threads='1'/>
|
|
||||||
</cpu>
|
|
||||||
<clock offset='utc'/>
|
|
||||||
<on_poweroff>destroy</on_poweroff>
|
|
||||||
<on_reboot>restart</on_reboot>
|
|
||||||
<on_crash>destroy</on_crash>
|
|
||||||
<devices>
|
|
||||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
|
||||||
<controller type='usb' index='0'>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
||||||
</controller>
|
|
||||||
<controller type='pci' index='0' model='pci-root'/>
|
|
||||||
<input type='mouse' bus='ps2'/>
|
|
||||||
<input type='keyboard' bus='ps2'/>
|
|
||||||
<audio id='1' type='none'/>
|
|
||||||
<memballoon model='virtio'>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
||||||
</memballoon>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
<domain type='qemu' id='7'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory unit='KiB'>219100</memory>
|
|
||||||
<currentMemory unit='KiB'>219100</currentMemory>
|
|
||||||
<vcpu placement='static' current='7'>8</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='x86_64' machine='pc'>hvm</type>
|
|
||||||
<boot dev='network'/>
|
|
||||||
</os>
|
|
||||||
<cpu>
|
|
||||||
<topology sockets='4' dies='1' cores='2' threads='1'/>
|
|
||||||
</cpu>
|
|
||||||
<clock offset='utc'/>
|
|
||||||
<on_poweroff>destroy</on_poweroff>
|
|
||||||
<on_reboot>restart</on_reboot>
|
|
||||||
<on_crash>destroy</on_crash>
|
|
||||||
<devices>
|
|
||||||
<emulator>/usr/bin/qemu-system-x86_64</emulator>
|
|
||||||
<controller type='usb' index='0'>
|
|
||||||
<alias name='usb'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
|
|
||||||
</controller>
|
|
||||||
<controller type='pci' index='0' model='pci-root'>
|
|
||||||
<alias name='pci.0'/>
|
|
||||||
</controller>
|
|
||||||
<input type='mouse' bus='ps2'>
|
|
||||||
<alias name='input0'/>
|
|
||||||
</input>
|
|
||||||
<input type='keyboard' bus='ps2'>
|
|
||||||
<alias name='input1'/>
|
|
||||||
</input>
|
|
||||||
<audio id='1' type='none'/>
|
|
||||||
<memballoon model='virtio'>
|
|
||||||
<alias name='balloon0'/>
|
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
||||||
</memballoon>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
||||||
Loading…
Reference in New Issue
Block a user