mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-28 11:55:23 +03:00
Merge pull request #8859 from poettering/virt-xen-lying
Prefer DMI over CPUID when detecting Xen
This commit is contained in:
commit
3776f9cf00
@ -311,21 +311,24 @@ static int detect_vm_zvm(void) {
|
||||
/* Returns a short identifier for the various VM implementations */
|
||||
int detect_vm(void) {
|
||||
static thread_local int cached_found = _VIRTUALIZATION_INVALID;
|
||||
int r, dmi;
|
||||
bool other = false;
|
||||
int r, dmi;
|
||||
|
||||
if (cached_found >= 0)
|
||||
return cached_found;
|
||||
|
||||
/* We have to use the correct order here:
|
||||
*
|
||||
* -> First try to detect Oracle Virtualbox, even if it uses KVM.
|
||||
* -> 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. */
|
||||
* → First, try to detect Oracle Virtualbox, even if it uses KVM, as well as Xen even if it cloaks as Microsoft
|
||||
* Hyper-V.
|
||||
*
|
||||
* → 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();
|
||||
if (dmi == VIRTUALIZATION_ORACLE) {
|
||||
if (IN_SET(dmi, VIRTUALIZATION_ORACLE, VIRTUALIZATION_XEN)) {
|
||||
r = dmi;
|
||||
goto finish;
|
||||
}
|
||||
@ -333,21 +336,19 @@ int detect_vm(void) {
|
||||
r = detect_vm_cpuid();
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
}
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (r != VIRTUALIZATION_NONE)
|
||||
goto finish;
|
||||
|
||||
r = dmi;
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
/* Now, let's get back to DMI */
|
||||
if (dmi < 0)
|
||||
return dmi;
|
||||
if (dmi == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (dmi != VIRTUALIZATION_NONE) {
|
||||
r = dmi;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* x86 xen will most likely be detected by cpuid. If not (most likely
|
||||
@ -359,42 +360,34 @@ int detect_vm(void) {
|
||||
r = detect_vm_xen();
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
}
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (r != VIRTUALIZATION_NONE)
|
||||
goto finish;
|
||||
|
||||
r = detect_vm_hypervisor();
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
}
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (r != VIRTUALIZATION_NONE)
|
||||
goto finish;
|
||||
|
||||
r = detect_vm_device_tree();
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
}
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (r != VIRTUALIZATION_NONE)
|
||||
goto finish;
|
||||
|
||||
r = detect_vm_uml();
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r != VIRTUALIZATION_NONE) {
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else
|
||||
goto finish;
|
||||
}
|
||||
if (r == VIRTUALIZATION_VM_OTHER)
|
||||
other = true;
|
||||
else if (r != VIRTUALIZATION_NONE)
|
||||
goto finish;
|
||||
|
||||
r = detect_vm_zvm();
|
||||
if (r < 0)
|
||||
@ -405,10 +398,12 @@ finish:
|
||||
* In order to detect the Dom0 as not virtualization we need to
|
||||
* double-check it */
|
||||
if (r == VIRTUALIZATION_XEN) {
|
||||
int ret = detect_vm_xen_dom0();
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
if (ret > 0)
|
||||
int dom0;
|
||||
|
||||
dom0 = detect_vm_xen_dom0();
|
||||
if (dom0 < 0)
|
||||
return dom0;
|
||||
if (dom0 > 0)
|
||||
r = VIRTUALIZATION_NONE;
|
||||
} else if (r == VIRTUALIZATION_NONE && other)
|
||||
r = VIRTUALIZATION_VM_OTHER;
|
||||
|
Loading…
Reference in New Issue
Block a user