shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

Merge pull request #8859 from poettering/virt-xen-lying

Browse Source 
Prefer DMI over CPUID when detecting Xen
This commit is contained in:
Yu Watanabe 2018-05-03 23:23:32 +09:00 committed by GitHub
commit 3776f9cf00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/basic/virt.c
View File

@ -311,21 +311,24 @@ static int detect_vm_zvm(void) {
/* Returns a short identifier for the various VM implementations */ /* Returns a short identifier for the various VM implementations */
int detect_vm(void) { int detect_vm(void) {
static thread_local int cached_found = _VIRTUALIZATION_INVALID; static thread_local int cached_found = _VIRTUALIZATION_INVALID;
int r, dmi;
bool other = false; bool other = false;
int r, dmi;
if (cached_found >= 0) if (cached_found >= 0)
return cached_found; return cached_found;
/* We have to use the correct order here: /* We have to use the correct order here:
* *
* -> First try to detect Oracle Virtualbox, even if it uses KVM. * → First, try to detect Oracle Virtualbox, even if it uses KVM, as well as Xen even if it cloaks as Microsoft
* -> Second try to detect from cpuid, this will report KVM for * Hyper-V.
* whatever software is used even if info in dmi is overwritten. *
* -> Third try to detect from dmi. */ * → Second, try to detect from CPUID, this will report KVM for whatever software is used even if info in DMI is
* overwritten.
*
* → Third, try to detect from DMI. */
dmi = detect_vm_dmi(); dmi = detect_vm_dmi();
if (dmi == VIRTUALIZATION_ORACLE) { if (IN_SET(dmi, VIRTUALIZATION_ORACLE, VIRTUALIZATION_XEN)) {
r = dmi; r = dmi;
goto finish; goto finish;
} }
@ -333,20 +336,18 @@ int detect_vm(void) {
r = detect_vm_cpuid(); r = detect_vm_cpuid();
if (r < 0) if (r < 0)
return r; return r;
if (r != VIRTUALIZATION_NONE) {
if (r == VIRTUALIZATION_VM_OTHER) if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (r != VIRTUALIZATION_NONE)
goto finish; goto finish;
}
r = dmi; /* Now, let's get back to DMI */
if (r < 0) if (dmi < 0)
return r; return dmi;
if (r != VIRTUALIZATION_NONE) { if (dmi == VIRTUALIZATION_VM_OTHER)
if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (dmi != VIRTUALIZATION_NONE) {
r = dmi;
goto finish; goto finish;
} }
@ -359,42 +360,34 @@ int detect_vm(void) {
r = detect_vm_xen(); r = detect_vm_xen();
if (r < 0) if (r < 0)
return r; return r;
if (r != VIRTUALIZATION_NONE) {
if (r == VIRTUALIZATION_VM_OTHER) if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (r != VIRTUALIZATION_NONE)
goto finish; goto finish;
}
r = detect_vm_hypervisor(); r = detect_vm_hypervisor();
if (r < 0) if (r < 0)
return r; return r;
if (r != VIRTUALIZATION_NONE) {
if (r == VIRTUALIZATION_VM_OTHER) if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (r != VIRTUALIZATION_NONE)
goto finish; goto finish;
}
r = detect_vm_device_tree(); r = detect_vm_device_tree();
if (r < 0) if (r < 0)
return r; return r;
if (r != VIRTUALIZATION_NONE) {
if (r == VIRTUALIZATION_VM_OTHER) if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (r != VIRTUALIZATION_NONE)
goto finish; goto finish;
}
r = detect_vm_uml(); r = detect_vm_uml();
if (r < 0) if (r < 0)
return r; return r;
if (r != VIRTUALIZATION_NONE) {
if (r == VIRTUALIZATION_VM_OTHER) if (r == VIRTUALIZATION_VM_OTHER)
other = true; other = true;
else else if (r != VIRTUALIZATION_NONE)
goto finish; goto finish;
}
r = detect_vm_zvm(); r = detect_vm_zvm();
if (r < 0) if (r < 0)
@ -405,10 +398,12 @@ finish:
* In order to detect the Dom0 as not virtualization we need to * In order to detect the Dom0 as not virtualization we need to
* double-check it */ * double-check it */
if (r == VIRTUALIZATION_XEN) { if (r == VIRTUALIZATION_XEN) {
int ret = detect_vm_xen_dom0(); int dom0;
if (ret < 0)
return ret; dom0 = detect_vm_xen_dom0();
if (ret > 0) if (dom0 < 0)
return dom0;
if (dom0 > 0)
r = VIRTUALIZATION_NONE; r = VIRTUALIZATION_NONE;
} else if (r == VIRTUALIZATION_NONE && other) } else if (r == VIRTUALIZATION_NONE && other)
r = VIRTUALIZATION_VM_OTHER; r = VIRTUALIZATION_VM_OTHER;