Add test file to EXTRA_DIST

[virt-what.git] / virt-what.in

diff --git a/virt-what.in b/virt-what.in
index 3dac91a..d56c84f 100644 (file)
--- a/virt-what.in
+++ b/virt-what.in
@@ -114,8 +114,13 @@ dmi=$(LANG=C dmidecode 2>&1)
 arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
 
 # Check for Alibaba Cloud
-if echo "$dmi" | grep -q 'Manufacturer: Alibaba Cloud'; then
-    echo "alibaba_cloud"
+if echo "$dmi" | grep -q 'Manufacturer: Alibaba'; then
+    # Check for Alibaba Cloud ECS Bare Metal (EBM) Instance
+    if ( { echo -e "GET /latest/meta-datainstance/instance-type HTTP/1.0\r\nHost: 100.100.100.200\r\n\r" >&3; grep -sq 'ebm' <&3 ; } 3<> /dev/tcp/100.100.100.200/80 ) 2>/dev/null ; then
+        echo "alibaba_cloud-ebm"
+    else
+        echo "alibaba_cloud"
+    fi
 fi
 
 # Check for VMware.
@@ -227,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.
@@ -242,6 +244,16 @@ if echo "$dmi" | grep -q 'Product Name: RHEV Hypervisor'; then
     echo rhev
 fi
 
+# Google Cloud
+if echo "$dmi" | grep -q 'Product Name: Google Compute Engine'; then
+    echo google_cloud
+fi
+
+# Red Hat's hypervisor.
+if echo "$dmi" | grep -q 'Manufacturer: Red Hat'; then
+    echo redhat
+fi
+
 # Check for Xen.
 
 if [ "$cpuid" = "XenVMMXenVMM" ] &&