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

virt-host-validate: improve tests for arm/aarch64

Browse Source 
ARM/Aarch64 /proc/cpuinfo has no virtualization related flags.
Refactor the Qemu/KVM test a bit:

1) run the "for hardware virtualization" test only on plaforms with known
   cpuinfo flags (x86, s390)
2) test for /dev/kvm also on platforms where no cpu flags are set

Finally Add a more generic error hint message for non-x86 plaforms
when /dev/kvm is missing.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Riku Voipio 2016-06-03 15:53:58 +03:00 committed by Michal Privoznik
parent 148689ec96
commit fc1b2428ac
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/virt-host-validate-qemu.c
View File

@ -32,8 +32,9 @@ int virHostValidateQEMU(void)
virBitmapPtr flags; virBitmapPtr flags;
int ret = 0; int ret = 0;
bool hasHwVirt = false; bool hasHwVirt = false;
bool hasVirtFlag = false;
virHostMsgCheck("QEMU", "%s", _("for hardware virtualization")); char *kvmhint = _("Check that CPU and firmware supports virtualization "
"and kvm module is loaded");
if (!(flags = virHostValidateGetCPUFlags())) if (!(flags = virHostValidateGetCPUFlags()))
return -1; return -1;
@ -41,12 +42,16 @@ int virHostValidateQEMU(void)
switch (virArchFromHost()) { switch (virArchFromHost()) {
case VIR_ARCH_I686: case VIR_ARCH_I686:
case VIR_ARCH_X86_64: case VIR_ARCH_X86_64:
hasVirtFlag = true;
kvmhint = _("Check that the 'kvm-intel' or 'kvm-amd' modules are "
"loaded & the BIOS has enabled virtualization");
if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM) || if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM) ||
virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX))
hasHwVirt = true; hasHwVirt = true;
break; break;
case VIR_ARCH_S390: case VIR_ARCH_S390:
case VIR_ARCH_S390X: case VIR_ARCH_S390X:
hasVirtFlag = true;
if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SIE)) if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SIE))
hasHwVirt = true; hasHwVirt = true;
break; break;
@ -54,21 +59,27 @@ int virHostValidateQEMU(void)
hasHwVirt = false; hasHwVirt = false;
} }
if (hasHwVirt) { if (hasVirtFlag) {
virHostMsgPass(); virHostMsgCheck("QEMU", "%s", _("for hardware virtualization"));
if (hasHwVirt) {
virHostMsgPass();
} else {
virHostMsgFail(VIR_HOST_VALIDATE_FAIL,
_("Only emulated CPUs are available, performance will be significantly limited"));
ret = -1;
}
}
if (hasHwVirt || !hasVirtFlag) {
if (virHostValidateDeviceExists("QEMU", "/dev/kvm", if (virHostValidateDeviceExists("QEMU", "/dev/kvm",
VIR_HOST_VALIDATE_FAIL, VIR_HOST_VALIDATE_FAIL,
_("Check that the 'kvm-intel' or 'kvm-amd' modules are " kvmhint) <0)
"loaded & the BIOS has enabled virtualization")) < 0)
ret = -1; ret = -1;
else if (virHostValidateDeviceAccessible("QEMU", "/dev/kvm", else if (virHostValidateDeviceAccessible("QEMU", "/dev/kvm",
VIR_HOST_VALIDATE_FAIL, VIR_HOST_VALIDATE_FAIL,
_("Check /dev/kvm is world writable or you are in " _("Check /dev/kvm is world writable or you are in "
"a group that is allowed to access it")) < 0) "a group that is allowed to access it")) < 0)
ret = -1; ret = -1;
} else {
virHostMsgFail(VIR_HOST_VALIDATE_WARN,
_("Only emulated CPUs are available, performance will be significantly limited"));
} }
virBitmapFree(flags); virBitmapFree(flags);