X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=f6854611baad9ffe330acd8719a5a7d6dd153113;hb=0a0d9fa7c85c5474870cae37832d28ccd899d4ee;hp=a05e0db32091842d9bbee3b09af3f94ec47dcc03;hpb=9d90704a05dee7704470eff818a1c44aeef6c880;p=virt-what.git diff --git a/virt-what.in b/virt-what.in index a05e0db..f685461 100644 --- a/virt-what.in +++ b/virt-what.in @@ -1,6 +1,6 @@ #!/bin/sh - # @configure_input@ -# Copyright (C) 2008-2015 Red Hat Inc. +# Copyright (C) 2008-2017 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 @@ -38,6 +38,13 @@ have_cpuinfo () { test -e "${root}/proc/cpuinfo" } +use_sysctl() { + # Lacking /proc, on some systems sysctl can be used instead. + OS=$(uname) || fail "failed to get operating system name" + + [ "$OS" = "OpenBSD" ] +} + fail () { echo "virt-what: $1" >&2 exit 1 @@ -102,9 +109,9 @@ cpuid=$(virt-what-cpuid-helper) dmi=$(LANG=C dmidecode 2>&1) # Architecture. -# Note for the purpose of testing, we only call uname with -p option. +# Note for the purpose of testing, we only call uname with -m option. -arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') +arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/') # Check for VMware. # cpuid check added by Chetan Loke. @@ -223,12 +230,9 @@ fi # Check for Xen. -if [ "$cpuid" = "XenVMMXenVMM" ]; then +if [ "$cpuid" = "XenVMMXenVMM" ] && + ! echo "$dmi" | grep -q 'No SMBIOS nor DMI entry point found, sorry'; then echo xen; echo xen-hvm - # Check for AWS - if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then - echo aws - fi skip_qemu_kvm=true elif [ -d "${root}/proc/xen" ]; then echo xen @@ -303,6 +307,12 @@ if ! "$skip_qemu_kvm"; then # We are running as a spapr KVM guest on ppc64 echo kvm skip_lkvm=true + elif use_sysctl; then + # SmartOS KVM + product=$(sysctl -n hw.product) + if echo "$product" | grep -q 'SmartDC HVM'; then + echo kvm + fi else # This is known to fail for qemu with the explicit -cpu # option, since /proc/cpuinfo will not contain the QEMU @@ -338,7 +348,7 @@ fi # example /proc/ppc64/lparcfg systemtype line # system_type=IBM pSeries (emulated by qemu) -if [ "$arch" = "ppc64" ]; then +if [ "$arch" = "ppc64" ] || [ "$arch" = "ppc64le" ] ; 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_power-kvm @@ -378,3 +388,12 @@ if [ "${arch#sparc}" != "$arch" ] && [ -e "${root}/dev/mdesc" ]; then fi fi fi + +# Check for AWS. +# AWS on Xen. +if echo "$dmi" | grep -q 'Version: [0-9]\.[0-9]\.amazon'; then + echo aws +# AWS on baremetal or KVM. +elif echo "$dmi" | grep -q 'Vendor: Amazon EC2'; then + echo aws +fi