Merge pull request #1998 from eworm-de/virt

virt: detect dmi before cpuid
2015-11-23 18:21:06 +01:00
parent 9e6a4d57b6 050e65ada2
commit 062fc6d775
1 changed files with 2 additions and 2 deletions
@@ -269,13 +269,13 @@ int detect_vm(void) {
        if (cached_found >= 0)
                return cached_found;

-        r = detect_vm_cpuid();
+        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)