shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-13 17:18:18 +03:00
Code

Merge pull request #1998 from eworm-de/virt

Browse Source 
virt: detect dmi before cpuid
This commit is contained in:
Lennart Poettering 2015-11-23 18:21:06 +01:00
commit 062fc6d775
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/virt.c
View File

@ -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)