diff options
| author | Christian Hesse <mail@eworm.de> | 2015-11-23 13:55:04 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2015-11-23 14:02:18 +0100 |
| commit | 050e65ada2e0023a1a4c953522f39846c6bdebf8 (patch) | |
| tree | e559ac7bd37759f200e07e07bcf58a5c3ea70b18 | |
| parent | 8a85b710aaf40741b0990b7f923f35c923a2adab (diff) | |
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.
| -rw-r--r-- | src/basic/virt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/virt.c b/src/basic/virt.c index 1e5d6eea6e..a271c87333 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -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) |