External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: prefer new location of nested_hvm in libxl_domain_build_info

Browse Source 
If available, use b_info->nested_hvm instead of
b_info->u.hvm.nested_hvm. This will make nested HVM config available
also for PVH domains.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-19 02:50:32 +02:00 committed by Jim Fehlig
parent d4a8fa0cd1
commit 95d19cd015
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libxl/libxl_conf.c
View File

@ -455,7 +455,18 @@ libxlMakeDomBuildInfo(virDomainDefPtr def,
}
}
}
libxl_defbool_set(&b_info->u.hvm.nested_hvm, hasHwVirt);
#ifdef LIBXL_HAVE_BUILDINFO_NESTED_HVM
libxl_defbool_set(&b_info->nested_hvm, hasHwVirt);
#else
if (hvm) {
libxl_defbool_set(&b_info->u.hvm.nested_hvm, hasHwVirt);
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported nested HVM setting for %s machine on this Xen version"),
def->os.machine);
return -1;
}
#endif
}
if (def->cpu && def->cpu->mode == VIR_CPU_MODE_CUSTOM) {

2
tests/libxlxml2domconfigdata/fullvirt-cpuid.json
View File

@ -21,11 +21,11 @@
],
"sched_params": {
},
"nested_hvm": "False",
"type.hvm": {
"pae": "True",
"apic": "True",
"acpi": "True",
"nested_hvm": "False",
"nographic": "True",
"vnc": {
"enable": "False"

2
tests/libxlxml2domconfigdata/vnuma-hvm.json
View File

@ -109,11 +109,11 @@
"sched_params": {
},
"nested_hvm": "True",
"type.hvm": {
"pae": "True",
"apic": "True",
"acpi": "True",
"nested_hvm": "True",
"vga": {
"kind": "cirrus"
},