From: Richard W.M. Jones <rjones@redhat.com>
Date: Thu, 29 Jun 2017 10:22:21 +0000 (+0100)
Subject: Revert "Print 'qemu' fact when running in qemu environment on POWER 9 (RHBZ#1455676)."
X-Git-Tag: v1.16~9
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=516a3554c2f018e18f0b51e6e4a035f029e64543;p=virt-what.git

Revert "Print 'qemu' fact when running in qemu environment on POWER 9 (RHBZ#1455676)."

This reverts commit 15314ad0a6e3764f070b60f6df02a2f881b09fce.
---

diff --git a/tests/test-ppc64-kvm.sh b/tests/test-ppc64-kvm.sh
index 3a90429..c691c96 100755
--- a/tests/test-ppc64-kvm.sh
+++ b/tests/test-ppc64-kvm.sh
@@ -18,8 +18,7 @@
 root=tests/ppc64-kvm
 
 output="$(./virt-what --test-root=$root 2>&1)"
-expected="qemu
-ibm_power-kvm"
+expected="ibm_power-kvm"
 
 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 aee10cf..1a373ed 100644
--- a/virt-what.in
+++ b/virt-what.in
@@ -295,9 +295,6 @@ if ! "$skip_qemu_kvm"; then
         # another CPUID leaf for non-accelerated qemu.
         if grep -q 'QEMU' "${root}/proc/cpuinfo"; then
             echo qemu
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1455676#c6
-        elif grep -q 'emulated by qemu' "${root}/proc/cpuinfo"; then
-            echo qemu
         fi
     fi
 fi