shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

Merge pull request #11857 from rossburton/acrn

Browse Source 
virt: detect the ACRN hypervisor
This commit is contained in:
Lennart Poettering 2019-02-28 18:56:48 +01:00 committed by GitHub
commit 737e2f306e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,6 +125,11 @@
<entry>QNX hypervisor</entry> <entry>QNX hypervisor</entry>
</row> </row>
<row>
<entry><varname>acrn</varname></entry>
<entry><ulink url="https://projectacrn.org">ACRN hypervisor</ulink></entry>
</row>
<row> <row>
<entry valign="top" morerows="5">Container</entry> <entry valign="top" morerows="5">Container</entry>
<entry><varname>openvz</varname></entry> <entry><varname>openvz</varname></entry>

3
man/systemd.unit.xml
View File

@ -1093,7 +1093,8 @@
<varname>lxc-libvirt</varname>, <varname>lxc-libvirt</varname>,
<varname>systemd-nspawn</varname>, <varname>systemd-nspawn</varname>,
<varname>docker</varname>, <varname>docker</varname>,
<varname>rkt</varname> to test <varname>rkt</varname>,
<varname>acrn</varname> to test
against a specific implementation, or against a specific implementation, or
<varname>private-users</varname> to check whether we are running in a user namespace. See <varname>private-users</varname> to check whether we are running in a user namespace. See
<citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry> <citerefentry><refentrytitle>systemd-detect-virt</refentrytitle><manvolnum>1</manvolnum></citerefentry>

3
src/basic/virt.c
View File

@ -40,6 +40,8 @@ static int detect_vm_cpuid(void) {
/* https://wiki.freebsd.org/bhyve */ /* https://wiki.freebsd.org/bhyve */
{ "bhyve bhyve ", VIRTUALIZATION_BHYVE }, { "bhyve bhyve ", VIRTUALIZATION_BHYVE },
{ "QNXQVMBSQG", VIRTUALIZATION_QNX }, { "QNXQVMBSQG", VIRTUALIZATION_QNX },
/* https://projectacrn.org */
{ "ACRNACRNACRN", VIRTUALIZATION_ACRN },
}; };
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
@ -628,6 +630,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
[VIRTUALIZATION_PARALLELS] = "parallels", [VIRTUALIZATION_PARALLELS] = "parallels",
[VIRTUALIZATION_BHYVE] = "bhyve", [VIRTUALIZATION_BHYVE] = "bhyve",
[VIRTUALIZATION_QNX] = "qnx", [VIRTUALIZATION_QNX] = "qnx",
[VIRTUALIZATION_ACRN] = "acrn",
[VIRTUALIZATION_VM_OTHER] = "vm-other", [VIRTUALIZATION_VM_OTHER] = "vm-other",
[VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn", [VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn",

1
src/basic/virt.h
View File

@ -21,6 +21,7 @@ enum {
VIRTUALIZATION_PARALLELS, VIRTUALIZATION_PARALLELS,
VIRTUALIZATION_BHYVE, VIRTUALIZATION_BHYVE,
VIRTUALIZATION_QNX, VIRTUALIZATION_QNX,
VIRTUALIZATION_ACRN,
VIRTUALIZATION_VM_OTHER, VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER, VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,