chiark / gitweb /
man: include zVM in systemd-detect-virt list
authorLennart Poettering <lennart@poettering.net>
Fri, 10 Oct 2014 10:36:57 +0000 (12:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 10 Oct 2014 10:36:57 +0000 (12:36 +0200)
man/systemd-detect-virt.xml

index e167bddd07df5fcd744d666298f2062fa1c92f26..eed0fe0ce954c1c9a913381692ff2ca824381190 100644 (file)
@@ -69,7 +69,7 @@
                 are currently identified:</para>
 
                 <table>
                 are currently identified:</para>
 
                 <table>
-                  <title>Known VM virtualization technologies</title>
+                  <title>Known VM virtualization technologies (i.e. full hardware virtualization)</title>
                   <tgroup cols='2' align='left' colsep='1' rowsep='1'>
                     <colspec colname="id" />
                     <colspec colname="product" />
                   <tgroup cols='2' align='left' colsep='1' rowsep='1'>
                     <colspec colname="id" />
                     <colspec colname="product" />
                         <entry><varname>qemu</varname></entry>
                         <entry>QEMU software virtualization</entry>
                       </row>
                         <entry><varname>qemu</varname></entry>
                         <entry>QEMU software virtualization</entry>
                       </row>
+
                       <row>
                         <entry><varname>kvm</varname></entry>
                         <entry>Linux KVM kernel virtual machine</entry>
                       </row>
 
                       <row>
                         <entry><varname>kvm</varname></entry>
                         <entry>Linux KVM kernel virtual machine</entry>
                       </row>
 
+                      <row>
+                        <entry><varname>zvm</varname></entry>
+                        <entry>s390 z/VM</entry>
+                      </row>
+
                       <row>
                         <entry><varname>vmware</varname></entry>
                         <entry>VMware Workstation or Server, and related products</entry>
                       <row>
                         <entry><varname>vmware</varname></entry>
                         <entry>VMware Workstation or Server, and related products</entry>
 
                       <row>
                         <entry><varname>xen</varname></entry>
 
                       <row>
                         <entry><varname>xen</varname></entry>
-                        <entry>Xen hypervisor</entry>
+                        <entry>Xen hypervisor (only domU, not dom0)</entry>
                       </row>
 
                       <row>
                       </row>
 
                       <row>
                 </table>
 
                 <table>
                 </table>
 
                 <table>
-                  <title>Known container virtualization technologies</title>
+                  <title>Known container virtualization technologies (i.e. shared kernel virtualization)</title>
                   <tgroup cols='2' align='left' colsep='1' rowsep='1'>
                     <colspec colname="id" />
                     <colspec colname="product" />
                   <tgroup cols='2' align='left' colsep='1' rowsep='1'>
                     <colspec colname="id" />
                     <colspec colname="product" />