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

tests: reintroduce tests for libxl's legacy nested setting

Browse Source 
The preferred location for setting the nested CPU flag changed in
Xen 4.10 and is advertised via the LIBXL_HAVE_BUILDINFO_NESTED_HVM
define.  Commit 95d19cd0 changed libxl to use the new preferred
location but unconditionally changed the tests, causing 'make check'
failures against Xen < 4.10 that do not contain the new location.

Commit e94415d5 fixed the failures by only running the tests when
LIBXL_HAVE_BUILDINFO_NESTED_HVM is defined. Since libvirt supports
several versions of Xen that use the old nested location, it is
prudent to test the flag is set correctly. This patch reintroduces
the tests for the legacy location of the nested setting.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Jim Fehlig
2018-09-26 11:31:19 -06:00
committed by Erik Skultety
parent 125ac4c0a8
commit 25456e0470
5 changed files with 375 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json Normal file
View File

@@ -0,0 +1,178 @@
{
"c_info": {
"type": "hvm",
"name": "test-hvm",
"uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b"
},
"b_info": {
"max_vcpus": 6,
"avail_vcpus": [
0,
1,
2,
3,
4,
5
],
"vnuma_nodes": [
{
"memkb": 2097152,
"distances": [
10,
21,
31,
41,
51,
61
],
"vcpus": [
0
]
},
{
"memkb": 2097152,
"distances": [
21,
10,
21,
31,
41,
51
],
"vcpus": [
1
]
},
{
"memkb": 2097152,
"distances": [
31,
21,
10,
21,
31,
41
],
"vcpus": [
2
]
},
{
"memkb": 2097152,
"distances": [
41,
31,
21,
10,
21,
31
],
"vcpus": [
3
]
},
{
"memkb": 2097152,
"distances": [
51,
41,
31,
21,
10,
21
],
"vcpus": [
4
]
},
{
"memkb": 2097152,
"distances": [
61,
51,
41,
31,
21,
10
],
"vcpus": [
5
]
}
],
"max_memkb": 1048576,
"target_memkb": 1048576,
"video_memkb": 8192,
"shadow_memkb": 14336,
"device_model_version": "qemu_xen",
"device_model": "/bin/true",
"sched_params": {
},
"type.hvm": {
"pae": "True",
"apic": "True",
"acpi": "True",
"nested_hvm": "True",
"vga": {
"kind": "cirrus"
},
"vnc": {
"enable": "True",
"listen": "0.0.0.0",
"findunused": "False"
},
"sdl": {
"enable": "False"
},
"spice": {
},
"boot": "c",
"rdm": {
}
},
"arch_arm": {
}
},
"disks": [
{
"pdev_path": "/var/lib/xen/images/test-hvm.img",
"vdev": "hda",
"backend": "qdisk",
"format": "raw",
"removable": 1,
"readwrite": 1
}
],
"nics": [
{
"devid": 0,
"mac": "00:16:3e:66:12:b4",
"bridge": "br0",
"script": "/etc/xen/scripts/vif-bridge",
"nictype": "vif_ioemu"
}
],
"vfbs": [
{
"devid": -1,
"vnc": {
"enable": "True",
"listen": "0.0.0.0",
"findunused": "False"
},
"sdl": {
"enable": "False"
}
}
],
"vkbs": [
{
"devid": -1
}
],
"on_reboot": "restart"
}