Merge pull request #8251 from Shuangistan/pr_virt_qnx

man/systemd-detect-virt.xml

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

man/systemd.unit.xml

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

src/basic/virt.c

@@ -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",

src/basic/virt.h

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