shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

Merge pull request #8251 from Shuangistan/pr_virt_qnx

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-02-22 17:06:29 +01:00 committed by GitHub
commit d156d1d2c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/systemd-detect-virt.xml
View File

@ -91,7 +91,7 @@
</thead>
<tbody>
<row>
<entry valign="top" morerows="10">VM</entry>
<entry valign="top" morerows="11">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization, without KVM</entry>
</row>
@ -143,11 +143,16 @@
<entry>Parallels Desktop, Parallels Server</entry>
</row>
<row>
<row>
<entry><varname>bhyve</varname></entry>
<entry>bhyve, FreeBSD hypervisor</entry>
</row>
<row>
<entry><varname>qnx</varname></entry>
<entry>QNX hypervisor</entry>
</row>
<row>
<entry valign="top" morerows="5">Container</entry>
<entry><varname>openvz</varname></entry>

2
man/systemd.unit.xml
View File

@ -1093,6 +1093,8 @@
<varname>xen</varname>,
<varname>bochs</varname>,
<varname>uml</varname>,
<varname>bhyve</varname>,
<varname>qnx</varname>,
<varname>openvz</varname>,
<varname>lxc</varname>,
<varname>lxc-libvirt</varname>,

2
src/basic/virt.c
View File

@ -57,6 +57,7 @@ static int detect_vm_cpuid(void) {
{ "Microsoft Hv", VIRTUALIZATION_MICROSOFT },
/* https://wiki.freebsd.org/bhyve */
{ "bhyve bhyve ", VIRTUALIZATION_BHYVE },
{ "QNXQVMBSQG", VIRTUALIZATION_QNX },
};
uint32_t eax, ebx, ecx, edx;
@ -628,6 +629,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
[VIRTUALIZATION_ZVM] = "zvm",
[VIRTUALIZATION_PARALLELS] = "parallels",
[VIRTUALIZATION_BHYVE] = "bhyve",
[VIRTUALIZATION_QNX] = "qnx",
[VIRTUALIZATION_VM_OTHER] = "vm-other",
[VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn",

1
src/basic/virt.h
View File

@ -39,6 +39,7 @@ enum {
VIRTUALIZATION_ZVM,
VIRTUALIZATION_PARALLELS,
VIRTUALIZATION_BHYVE,
VIRTUALIZATION_QNX,
VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,