shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

virt: Support detection of LMHS SRE guests

Browse Source 
(cherry picked from commit d833ed781f61b820e7abb17caa85c3c37c7ea807)
(cherry picked from commit 0ba8e9ecff068bfdeba4f8aa8b0e030f577b0892)
This commit is contained in:
Neil Moore 2022-12-01 14:03:06 -05:00 committed by Zbigniew Jędrzejewski-Szmek
parent 7160de171d
commit df977d44e3
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,7 @@
</thead>
<tbody>
<row>
<entry valign="top" morerows="15">VM</entry>
<entry valign="top" morerows="16">VM</entry>
<entry><varname>qemu</varname></entry>
<entry>QEMU software virtualization, without KVM</entry>
</row>
@ -142,6 +142,11 @@
<entry><ulink url="https://developer.apple.com/documentation/virtualization">Apple Virtualization.framework</ulink></entry>
</row>
<row>
<entry><varname>sre</varname></entry>
<entry><ulink url="https://www.lockheedmartin.com/en-us/products/Hardened-Security-for-Intel-Processors.html">LMHS SRE hypervisor</ulink></entry>
</row>
<row>
<entry valign="top" morerows="9">Container</entry>
<entry><varname>openvz</varname></entry>

1
man/systemd.unit.xml
View File

@ -1264,6 +1264,7 @@
<literal>bhyve</literal>,
<literal>qnx</literal>,
<literal>apple</literal>,
<literal>sre</literal>,
<literal>openvz</literal>,
<literal>lxc</literal>,
<literal>lxc-libvirt</literal>,

3
src/basic/virt.c
View File

@ -50,6 +50,8 @@ static Virtualization detect_vm_cpuid(void) {
{ "QNXQVMBSQG", VIRTUALIZATION_QNX },
/* https://projectacrn.org */
{ "ACRNACRNACRN", VIRTUALIZATION_ACRN },
/* https://www.lockheedmartin.com/en-us/products/Hardened-Security-for-Intel-Processors.html */
{ "SRESRESRESRE", VIRTUALIZATION_SRE },
};
uint32_t eax, ebx, ecx, edx;
@ -1020,6 +1022,7 @@ static const char *const virtualization_table[_VIRTUALIZATION_MAX] = {
[VIRTUALIZATION_ACRN] = "acrn",
[VIRTUALIZATION_POWERVM] = "powervm",
[VIRTUALIZATION_APPLE] = "apple",
[VIRTUALIZATION_SRE] = "sre",
[VIRTUALIZATION_VM_OTHER] = "vm-other",
[VIRTUALIZATION_SYSTEMD_NSPAWN] = "systemd-nspawn",

1
src/basic/virt.h
View File

@ -26,6 +26,7 @@ typedef enum Virtualization {
VIRTUALIZATION_ACRN,
VIRTUALIZATION_POWERVM,
VIRTUALIZATION_APPLE,
VIRTUALIZATION_SRE,
VIRTUALIZATION_VM_OTHER,
VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,