From: Neil Moore <neil.a.moore@lmco.com>
Date: Thu, 1 Dec 2022 19:03:06 +0000 (-0500)
Subject: virt: Support detection of LMHS SRE guests
X-Git-Tag: v253-rc1~393
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d833ed781f61b820e7abb17caa85c3c37c7ea807;p=thirdparty%2Fsystemd.git

virt: Support detection of LMHS SRE guests
---

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index a8c089d0b51..a92d83fe298 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -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>
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 8e1a3464dfb..0c17d918148 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1285,6 +1285,7 @@
           <literal>bhyve</literal>,
           <literal>qnx</literal>,
           <literal>apple</literal>,
+          <literal>sre</literal>,
           <literal>openvz</literal>,
           <literal>lxc</literal>,
           <literal>lxc-libvirt</literal>,
diff --git a/src/basic/virt.c b/src/basic/virt.c
index 9a0b5a28d19..7c238613e6d 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -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;
@@ -1036,6 +1038,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",
diff --git a/src/basic/virt.h b/src/basic/virt.h
index e19a2389398..d49f3237e81 100644
--- a/src/basic/virt.h
+++ b/src/basic/virt.h
@@ -26,6 +26,7 @@ typedef enum Virtualization {
         VIRTUALIZATION_ACRN,
         VIRTUALIZATION_POWERVM,
         VIRTUALIZATION_APPLE,
+        VIRTUALIZATION_SRE,
         VIRTUALIZATION_VM_OTHER,
         VIRTUALIZATION_VM_LAST = VIRTUALIZATION_VM_OTHER,