diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-02 08:00:38 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-02 08:00:38 +0200 |
| commit | f22572452b55f78ec9cddfdb0229c1d93dd9ce67 (patch) | |
| tree | 81d5b75aa701f475ba189e2a1d9834a4f3b45d05 | |
| parent | Merge pull request #1115 from phomes/hwdb-mice (diff) | |
| parent | virt: detect parallels virtualization (diff) | |
| download | systemd-f22572452b55f78ec9cddfdb0229c1d93dd9ce67.tar.xz systemd-f22572452b55f78ec9cddfdb0229c1d93dd9ce67.zip | |
Merge pull request #1117 from evverx/detect-parallels-virt
virt: detect parallels virtualization
| -rw-r--r-- | man/systemd-detect-virt.xml | 7 | ||||
| -rw-r--r-- | src/basic/virt.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml index 40755a24d0..9ea9141d4d 100644 --- a/man/systemd-detect-virt.xml +++ b/man/systemd-detect-virt.xml @@ -88,7 +88,7 @@ </thead> <tbody> <row> - <entry morerows="8">VM</entry> + <entry morerows="9">VM</entry> <entry><varname>qemu</varname></entry> <entry>QEMU software virtualization</entry> </row> @@ -134,6 +134,11 @@ </row> <row> + <entry><varname>parallels</varname></entry> + <entry>Parallels Desktop, Parallels Server</entry> + </row> + + <row> <entry morerows="5">container</entry> <entry><varname>openvz</varname></entry> <entry>OpenVZ/Virtuozzo</entry> diff --git a/src/basic/virt.c b/src/basic/virt.c index a8d26716a1..4a4bebd528 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; |