diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-01-09 05:53:00 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-03-14 10:22:32 +0100 |
| commit | 4ebadef69ff96e92122a133cfecadf60816c4fa3 (patch) | |
| tree | d7d65cccf110e8b12a4353c0d91db2b0b83f08dc /src/basic/virt.c | |
| parent | bd1ce0bdbfc97a958a6c56fe062bed892f08444a (diff) | |
Prep v226: Apply missing fixes and changes to src/basic
Diffstat (limited to 'src/basic/virt.c')
| -rw-r--r-- | src/basic/virt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/basic/virt.c b/src/basic/virt.c index 764de955a..1f9843bab 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -156,7 +156,8 @@ static int detect_vm_dmi(const char **_id) { "VMW\0" "vmware\0" "innotek GmbH\0" "oracle\0" "Xen\0" "xen\0" - "Bochs\0" "bochs\0"; + "Bochs\0" "bochs\0" + "Parallels\0" "parallels\0"; unsigned i; for (i = 0; i < ELEMENTSOF(dmi_vendors); i++) { @@ -244,8 +245,9 @@ int detect_vm(const char **id) { r = detect_vm_dmi(&_id); /* kvm with and without Virtualbox */ + /* Parallels exports KVMKVMKVM leaf */ if (streq_ptr(_id_cpuid, "kvm")) { - if (r > 0 && streq(_id, "oracle")) + if (r > 0 && (streq(_id, "oracle") || streq(_id, "parallels"))) goto finish; _id = _id_cpuid; |