From 7607348d0ea643a7ccaa154dca3c1721ac0e1385 Mon Sep 17 00:00:00 2001

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

Date: Fri, 4 Oct 2019 16:25:55 +0300

Subject: [PATCH 6/8] Add support for Nutanix Acropolis Hypervisor (AHV)

 (RHBZ#1756381).

Thanks: Cristian Seres for providing access to a guest.

Cherry picked from commit f317e788dd7c2a35c2ae0f64fa50ab720382ebf5

- Removed tests.

- Removed changes to configure.ac which are not applicable to

  virt-what 1.18.

---

 virt-what.in  | 10 +++++++++-

 virt-what.pod |  6 ++++++

 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/virt-what.in b/virt-what.in

index 29b7b0d..0178eb1 100644

--- a/virt-what.in

+++ b/virt-what.in

@@ -1,6 +1,6 @@

 #!/bin/sh -

 # @configure_input@

-# Copyright (C) 2008-2017 Red Hat Inc.

+# Copyright (C) 2008-2019 Red Hat Inc.

 #

 # This program is free software; you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by

@@ -213,6 +213,14 @@ if echo "$dmi" | grep -q 'Vendor: Parallels'; then

     skip_qemu_kvm=true

 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.

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

     echo ovirt

diff --git a/virt-what.pod b/virt-what.pod

index ebfc190..660c517 100644

--- a/virt-what.pod

+++ b/virt-what.pod

@@ -173,6 +173,12 @@ is lkvm (a.k.a kvmtool).

 Status: contributed by Andrew Jones

+=item B<nutanix_ahv>

+

+The guest is running inside Nutanix Acropolis Hypervisor (AHV).

+

+Status: confirmed by RWMJ.

+

 =item B<openvz>

 The guest appears to be running inside an OpenVZ or Virtuozzo

-- 

2.32.0