From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 10 Oct 2014 10:36:57 +0000 (+0200)
Subject: man: include zVM in systemd-detect-virt list
X-Git-Tag: v217~249
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=26d32dc5ee6d288108001f3fb7d45e25be441e14

man: include zVM in systemd-detect-virt list
---

diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml
index e167bddd0..eed0fe0ce 100644
--- a/man/systemd-detect-virt.xml
+++ b/man/systemd-detect-virt.xml
@@ -69,7 +69,7 @@
                 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" />
@@ -84,11 +84,17 @@
                         <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>zvm</varname></entry>
+                        <entry>s390 z/VM</entry>
+                      </row>
+
                       <row>
                         <entry><varname>vmware</varname></entry>
                         <entry>VMware Workstation or Server, and related products</entry>
@@ -106,7 +112,7 @@
 
                       <row>
                         <entry><varname>xen</varname></entry>
-                        <entry>Xen hypervisor</entry>
+                        <entry>Xen hypervisor (only domU, not dom0)</entry>
                       </row>
 
                       <row>
@@ -124,7 +130,7 @@
                 </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" />