basic: getauxval(AT_RANDOM) is apparently not necessarily aligned

[elogind.git] / src / basic / virt.c

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 4b6286567899fc2376ba8a30d30a91f742ea7480..bccde00f77a50eaff80f348774c3307a151f16bc 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -270,13 +270,20 @@ int detect_vm(void) {
         if (cached_found >= 0)
                 return cached_found;
 
-        r = detect_vm_cpuid();
+        /* We have to use the correct order here:
+         * Some virtualization technologies do use KVM hypervisor but are
+         * expected to be detected as something else. So detect DMI first.
+         *
+         * An example is Virtualbox since version 5.0, which uses KVM backend.
+         * Detection via DMI works corretly, the CPU ID would find KVM
+         * only. */
+        r = detect_vm_dmi();
         if (r < 0)
                 return r;
         if (r != VIRTUALIZATION_NONE)
                 goto finish;
 
-        r = detect_vm_dmi();
+        r = detect_vm_cpuid();
         if (r < 0)
                 return r;
         if (r != VIRTUALIZATION_NONE)