diff options
| author | Razvan Cojocaru <rcojocaru@bitdefender.com> | 2017-10-26 17:59:04 +0300 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-10-26 17:59:04 +0300 |
| commit | b1de39eefe5eae5c9ade8af6bf50acb66c0ba950 (patch) | |
| tree | 7198e5db0ac59007b63742c3dfc63f506004a46e /src/basic/virt.c | |
| parent | 496efec7cac79f4f13c3742cdcb7c71c3aefc244 (diff) | |
elogind-detect-virt: refine hypervisor detection (#7171)
Continue to try to get more details about the actual underlying
hypervisor with successive tests until none are available.
This fixes issue #7165.
Diffstat (limited to 'src/basic/virt.c')
| -rw-r--r-- | src/basic/virt.c | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/src/basic/virt.c b/src/basic/virt.c index 8df839243..742287917 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -318,6 +318,7 @@ static int detect_vm_zvm(void) { int detect_vm(void) { static thread_local int cached_found = _VIRTUALIZATION_INVALID; int r, dmi; + bool other = false; if (cached_found >= 0) return cached_found; @@ -338,14 +339,22 @@ int detect_vm(void) { r = detect_vm_cpuid(); if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } r = dmi; if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } /* x86 xen will most likely be detected by cpuid. If not (most likely * because we're not an x86 guest), then we should try the xen capabilities @@ -357,26 +366,42 @@ int detect_vm(void) { r = detect_vm_xen(); if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } r = detect_vm_hypervisor(); if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } r = detect_vm_device_tree(); if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } r = detect_vm_uml(); if (r < 0) return r; - if (r != VIRTUALIZATION_NONE) - goto finish; + if (r != VIRTUALIZATION_NONE) { + if (r == VIRTUALIZATION_VM_OTHER) + other = true; + else + goto finish; + } r = detect_vm_zvm(); if (r < 0) @@ -388,6 +413,8 @@ finish: * double-check it */ if (r == VIRTUALIZATION_XEN && detect_vm_xen_dom0()) r = VIRTUALIZATION_NONE; + else if (r == VIRTUALIZATION_NONE && other) + r = VIRTUALIZATION_VM_OTHER; cached_found = r; log_debug("Found VM virtualization %s", virtualization_to_string(r)); |