From: Thomas Huth <thuth@redhat.com>
Date: Tue, 4 Jul 2017 14:20:40 +0000 (+0200)
Subject: Add support for KVM on System Z
X-Git-Tag: v1.16~6
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=89c3d9e094934405266688d2061fe1105863ca17;p=virt-what.git

Add support for KVM on System Z

KVM on System Z can be discovered in the same way as z/VM, by
looking at the "VM* Control Program" lines in /proc/sysinfo.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/virt-what.in b/virt-what.in
index 64ab770..5cf2136 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -194,7 +194,9 @@ fi
 if have_cpuinfo && grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"; then
     echo ibm_systemz
     if [ -f "${root}/proc/sysinfo" ]; then
-        if grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then
+        if grep -q 'VM.*Control Program.*KVM/Linux' "${root}/proc/sysinfo"; then
+            echo ibm_systemz-kvm
+        elif grep -q 'VM.*Control Program.*z/VM' "${root}/proc/sysinfo"; then
             echo ibm_systemz-zvm
         elif grep -q '^LPAR' "${root}/proc/sysinfo"; then
             echo ibm_systemz-lpar
diff --git a/virt-what.pod b/virt-what.pod
index 272be70..2c087bf 100644
--- a/virt-what.pod
+++ b/virt-what.pod
@@ -78,7 +78,7 @@ Status: not confirmed
 This is Linux running directly on an LPAR on an IBM SystemZ
 hardware partitioning system.
 
-Status: not confirmed
+Status: confirmed by Thomas Huth
 
 =item B<ibm_systemz-zvm>
 
@@ -87,6 +87,12 @@ hardware partitioning system.
 
 Status: confirmed by RWMJ using a Fedora guest running in z/VM
 
+=item B<ibm_systemz-kvm>
+
+This is a KVM guest running on an IBM System Z hardware system.
+
+Status: contributed by Thomas Huth
+
 =item B<linux_vserver>
 
 This is printed for backwards compatibility with older virt-what which