system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-02 22:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virt: detect parallels virtualization

Browse source 
inspired by http://people.redhat.com/~rjones/virt-what/

see:
* http://git.annexia.org/?p=virt-what.git;a=blob;f=virt-what.in;h=a5ed33ef3e4bfa3281c9589eccac4d92dff1babe;hb=HEAD#l200
* http://git.annexia.org/?p=virt-what.git;a=blob;f=virt-what.in;h=a5ed33ef3e4bfa3281c9589eccac4d92dff1babe;hb=HEAD#l253
This commit is contained in:
Evgeny Vereshchagin 2015-09-02 01:43:32 +00:00
parent b92340af68
commit d84248ebec
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
man/systemd-detect-virt.xml
View file

@ -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>
@ -133,6 +133,11 @@
<entry>User-mode Linux</entry>
</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>

6
src/basic/virt.c
View file

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