From: Richard W.M. Jones Date: Mon, 20 Jun 2016 12:14:53 +0000 (+0100) Subject: Update the previous commit to use - standard for facts. X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=b022d1cb9a755dc1739487426006d6d18408adad;p=virt-what.git Update the previous commit to use - standard for facts. Also I renamed ppc64 to power, since that is the official IBM name. (cherry picked from commit d35e2b9a15540357ecdca3e98b4df915525fed0f) --- diff --git a/tests/test-ppc64-kvm.sh b/tests/test-ppc64-kvm.sh index ea844e1..c691c96 100755 --- a/tests/test-ppc64-kvm.sh +++ b/tests/test-ppc64-kvm.sh @@ -18,7 +18,7 @@ root=tests/ppc64-kvm output="$(./virt-what --test-root=$root 2>&1)" -expected="ibm_ppc64_kvm" +expected="ibm_power-kvm" if [ "$output" != "$expected" ]; then echo "$0: test failed because output did not match expected" diff --git a/tests/test-ppc64-lpar-dedicated.sh b/tests/test-ppc64-lpar-dedicated.sh index ef99b27..0316ea2 100755 --- a/tests/test-ppc64-lpar-dedicated.sh +++ b/tests/test-ppc64-lpar-dedicated.sh @@ -18,7 +18,7 @@ root=tests/ppc64-lpar-dedicated output="$(./virt-what --test-root=$root 2>&1)" -expected="ibm_ppc64_lpar_dedicated" +expected="ibm_power-lpar_dedicated" if [ "$output" != "$expected" ]; then echo "$0: test failed because output did not match expected" diff --git a/tests/test-ppc64-lpar-shared.sh b/tests/test-ppc64-lpar-shared.sh index eaac0e4..bbc974a 100755 --- a/tests/test-ppc64-lpar-shared.sh +++ b/tests/test-ppc64-lpar-shared.sh @@ -18,7 +18,7 @@ root=tests/ppc64-lpar-shared output="$(./virt-what --test-root=$root 2>&1)" -expected="ibm_ppc64_lpar_shared" +expected="ibm_power-lpar_shared" if [ "$output" != "$expected" ]; then echo "$0: test failed because output did not match expected" diff --git a/virt-what.in b/virt-what.in index a91845e..0e048a2 100644 --- a/virt-what.in +++ b/virt-what.in @@ -316,13 +316,13 @@ fi if [ "$arch" = "ppc64" ]; then if have_cpuinfo && grep -q 'platform.**pSeries' "${root}/proc/cpuinfo"; then if grep -q 'model.*emulated by qemu' "${root}/proc/cpuinfo"; then - echo ibm_ppc64_kvm + echo ibm_power-kvm else # Assume LPAR, now detect shared or dedicated if grep -q 'shared_processor_mode=1' "${root}/proc/ppc64/lparcfg"; then - echo ibm_ppc64_lpar_shared + echo ibm_power-lpar_shared else - echo ibm_ppc64_lpar_dedicated + echo ibm_power-lpar_dedicated fi # detect powerkvm? fi diff --git a/virt-what.pod b/virt-what.pod index 4e38414..fe9567f 100644 --- a/virt-what.pod +++ b/virt-what.pod @@ -37,6 +37,21 @@ This is Microsoft Hyper-V hypervisor. Status: confirmed by RWMJ +=item B + +This is an IBM POWER KVM guest. + +Status: contributed by Adrian Likins. + +=item B + +=item B + +This is an IBM POWER LPAR (hardware partition) in either shared +or dedicated mode. + +Status: contributed by Adrian Likins. + =item B This is an IBM SystemZ (or other S/390) hardware partitioning system.