From: Christian Hesse <mail@eworm.de>
Date: Mon, 23 Nov 2015 12:55:04 +0000 (+0100)
Subject: virt: detect dmi before cpuid
X-Git-Tag: v229.1~1^2~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7f3a80e5c0dd402adf7e0a2cd58313ae1ddb86b2;hp=9ac0cc095b2d17cd0029048d902ff7b5e353e23e;p=elogind.git

virt: detect dmi before cpuid

Virtualbox should be detected as 'oracle'. This used to work but broke
with commit:

    commit 75f86906c52735c98dc0aa7e24b773edb42ee814
    Author: Lennart Poettering <lennart@poettering.net>
    Date:   Mon Sep 7 13:42:47 2015 +0200

    basic: rework virtualization detection API

We swap detection for dmi and cpuid, this fixes Virtualbox with KVM.
Hopefully it does not break anything else.
---

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 4b6286567..a38110542 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -270,13 +270,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)