From 3d0a9d20c97f9f6d9be5229a94409b57ef429e35 Mon Sep 17 00:00:00 2001

From: "Richard W.M. Jones" <rjones@redhat.com>

Date: Thu, 22 Jul 2021 08:58:16 +0100

Subject: [PATCH 34/36] Display kvm/qemu fact for Nutanix AHV

Since these are based on KVM we should display those facts too.

Thanks: Paolo Bonzini

(cherry picked from commit c7f55d08c9ab2aaf56ebd0d179491f4e15b5097c)

---

 tests/nutanix-ahv/test.sh | 3 ++-

 virt-what.in              | 3 ---

 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/nutanix-ahv/test.sh b/tests/nutanix-ahv/test.sh

index a998dc0..d5d6af2 100755

--- a/tests/nutanix-ahv/test.sh

+++ b/tests/nutanix-ahv/test.sh

@@ -17,7 +17,8 @@

 output="$(PATH=../..:$PATH virt-what --test-root=. 2>&1)"

 expected="nutanix_ahv

-redhat"

+redhat

+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 850760e..d56c84f 100644

--- a/virt-what.in

+++ b/virt-what.in

@@ -232,11 +232,8 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then

 fi

 # Check for Nutanix AHV.

-# This is sufficiently different from KVM and has Viridian extensions,

-# so skip the KVM test.

 if echo "$dmi" | grep -q 'Manufacturer: Nutanix'; then

     echo nutanix_ahv

-    skip_qemu_kvm=true

 fi

 # Check for oVirt/RHEV.

-- 

2.31.1