diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-23 18:21:06 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-23 18:21:06 +0100 |
| commit | 062fc6d775f16fc1e98405bc31603fc36e20b65f (patch) | |
| tree | ca0a2f1cbaaa9875168779a2ced723d7fac4e162 /src/basic | |
| parent | 9e6a4d57b6d5014f0941c5e03bb3d089a795e9d9 (diff) | |
| parent | 050e65ada2e0023a1a4c953522f39846c6bdebf8 (diff) | |
Merge pull request #1998 from eworm-de/virt
virt: detect dmi before cpuid
Diffstat (limited to 'src/basic')
| -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) |