git.annexia.org
/
virt-what.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add lkvm detection
[virt-what.git]
/
virt-what.in
diff --git
a/virt-what.in
b/virt-what.in
index
7cc4853
..
ed08dae
100644
(file)
--- a/
virt-what.in
+++ b/
virt-what.in
@@
-1,4
+1,4
@@
-#!/bin/
ba
sh -
+#!/bin/sh -
# @configure_input@
# Copyright (C) 2008-2011 Red Hat Inc.
#
# @configure_input@
# Copyright (C) 2008-2011 Red Hat Inc.
#
@@
-18,27
+18,32
@@
# 'virt-what' tries to detect the type of virtualization being
# used (or none at all if we're running on bare-metal). It prints
# 'virt-what' tries to detect the type of virtualization being
# used (or none at all if we're running on bare-metal). It prints
-# out one o
f
more lines each being a 'fact' about the virtualization.
+# out one o
r
more lines each being a 'fact' about the virtualization.
#
# Please see also the manual page virt-what(1).
# This script should be run as root.
#
# The following resources were useful in writing this script:
#
# Please see also the manual page virt-what(1).
# This script should be run as root.
#
# The following resources were useful in writing this script:
-# . http://
www.dmo.ca/blog/20080530151107
+# . http://
dmo.ca/blog/detecting-virtualization-on-linux/
# Do not allow unset variables, and set defaults.
set -u
root=''
skip_qemu_kvm=false
# Do not allow unset variables, and set defaults.
set -u
root=''
skip_qemu_kvm=false
+skip_lkvm=false
VERSION="@VERSION@"
VERSION="@VERSION@"
-function fail {
+have_cpuinfo () {
+ test -e "${root}/proc/cpuinfo"
+}
+
+fail () {
echo "virt-what: $1" >&2
exit 1
}
echo "virt-what: $1" >&2
exit 1
}
-
function usage
{
+
usage ()
{
echo "virt-what [options]"
echo "Options:"
echo " --help Display this help"
echo "virt-what [options]"
echo "Options:"
echo " --help Display this help"
@@
-47,38
+52,42
@@
function usage {
}
# Handle the command line arguments, if any.
}
# Handle the command line arguments, if any.
-
-TEMP=$(getopt -o v --long help --long version --long test-root: -n 'virt-what' -- "$@")
-if [ $? != 0 ]; then exit 1; fi
-eval set -- "$TEMP"
-
-while true; do
+while test $# -gt 0; do
case "$1" in
--help) usage ;;
case "$1" in
--help) usage ;;
- --test-root)
+ --test-root
=*
)
# Deliberately undocumented: used for 'make check'.
# Deliberately undocumented: used for 'make check'.
- root="$2"
- shift 2
+ root=$(echo "$1" | sed 's/.*=//')
+ shift 1
+ test -z "$root" && fail "--test-root option requires a value"
;;
;;
- -v|--version) echo
$VERSION
; exit 0 ;;
+ -v|--version) echo
"$VERSION"
; exit 0 ;;
--) shift; break ;;
--) shift; break ;;
- *) fail "
internal error ($1)"
;;
+ *) fail "
unrecognized option '$1'"
;;
esac
done
esac
done
+test $# -gt 0 && fail "extra operand '$1'"
# Add /sbin and /usr/sbin to the path so we can find system
# Add /sbin and /usr/sbin to the path so we can find system
-# binaries like dmicode.
+# binaries like dmi
de
code.
# Add /usr/libexec to the path so we can find the helper binary.
prefix=@prefix@
exec_prefix=@exec_prefix@
# Add /usr/libexec to the path so we can find the helper binary.
prefix=@prefix@
exec_prefix=@exec_prefix@
-PATH=
$root@libexecdir@:$root/sbin:$root/usr/sbin:$PATH
+PATH=
"${root}@libexecdir@:${root}/sbin:${root}/usr/sbin:${PATH}"
# Check we're running as root.
# Check we're running as root.
+EFFUID=$(id -u) || fail "failed to get current user id"
-if [ "x$root" = "x" ] && [ "$EUID" -ne 0 ]; then
+if [ "x$root" = "x" ] && [ "$E
FF
UID" -ne 0 ]; then
fail "this script must be run as root"
fi
fail "this script must be run as root"
fi
+# Try to locate the CPU-ID helper program
+CPUID_HELPER=$(which virt-what-cpuid-helper 2>/dev/null)
+if [ -z "$CPUID_HELPER" ] ; then
+ fail "virt-what-cpuid-helper program not found in \$PATH"
+fi
+
# Many fullvirt hypervisors give an indication through CPUID. Use the
# helper program to get this information.
# Many fullvirt hypervisors give an indication through CPUID. Use the
# helper program to get this information.
@@
-131,7
+140,7
@@
fi
# container)
# /proc/bc - exists on node, but not inside container.
# container)
# /proc/bc - exists on node, but not inside container.
-if [ -d
$root/proc/vz -a ! -d $root/proc/bc
]; then
+if [ -d
"${root}/proc/vz" -a ! -d "${root}/proc/bc"
]; then
echo openvz
fi
echo openvz
fi
@@
-139,24
+148,31
@@
fi
# http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface
# Added by Marc Fournier
# http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface
# Added by Marc Fournier
-if [ -e
$root/proc/1/environ
] &&
- cat
$root/proc/1/environ
| tr '\000' '\n' | grep -Eiq '^container='; then
+if [ -e
"${root}/proc/1/environ"
] &&
+ cat
"${root}/proc/1/environ"
| tr '\000' '\n' | grep -Eiq '^container='; then
echo lxc
fi
# Check for Linux-VServer
echo lxc
fi
# Check for Linux-VServer
-if cat $root/proc/self/status | grep -q "VxID: [0-9]*"; then
+if test -e "${root}/proc/self/status" \
+ && cat "${root}/proc/self/status" | grep -q "VxID: [0-9]*"; then
echo linux_vserver
echo linux_vserver
+ if grep -q "VxID: 0$" "${root}/proc/self/status"; then
+ echo linux_vserver-host
+ else
+ echo linux_vserver-guest
+ fi
fi
# Check for UML.
# Added by Laurent Léonard.
fi
# Check for UML.
# Added by Laurent Léonard.
-if
grep -q 'UML' $root/proc/cpuinfo
; then
+if
have_cpuinfo && grep -q 'UML' "${root}/proc/cpuinfo"
; then
echo uml
fi
# Check for IBM PowerVM Lx86 Linux/x86 emulator.
echo uml
fi
# Check for IBM PowerVM Lx86 Linux/x86 emulator.
-if grep -q '^vendor_id.*PowerVM Lx86' $root/proc/cpuinfo; then
+if have_cpuinfo && grep -q '^vendor_id.*PowerVM Lx86' "${root}/proc/cpuinfo"
+then
echo powervm_lx86
fi
echo powervm_lx86
fi
@@
-167,12
+183,12
@@
if echo "$dmi" | grep -q 'Manufacturer.*HITACHI' &&
fi
# Check for IBM SystemZ.
fi
# Check for IBM SystemZ.
-if
grep -q '^vendor_id.*IBM/S390' $root/proc/cpuinfo
; then
+if
have_cpuinfo && grep -q '^vendor_id.*IBM/S390' "${root}/proc/cpuinfo"
; then
echo ibm_systemz
echo ibm_systemz
- if [ -f
$root/proc/sysinfo
]; then
- if grep -q 'VM.*Control Program.*z/VM'
$root/proc/sysinfo
; then
+ if [ -f
"${root}/proc/sysinfo"
]; then
+ if grep -q 'VM.*Control Program.*z/VM'
"${root}/proc/sysinfo"
; then
echo ibm_systemz-zvm
echo ibm_systemz-zvm
- elif grep -q '^LPAR'
$root/proc/sysinfo
; then
+ elif grep -q '^LPAR'
"${root}/proc/sysinfo"
; then
echo ibm_systemz-lpar
else
# This is unlikely to be correct.
echo ibm_systemz-lpar
else
# This is unlikely to be correct.
@@
-192,22
+208,23
@@
fi
if [ "$cpuid" = "XenVMMXenVMM" ]; then
echo xen; echo xen-hvm
skip_qemu_kvm=true
if [ "$cpuid" = "XenVMMXenVMM" ]; then
echo xen; echo xen-hvm
skip_qemu_kvm=true
-elif [ -
f $root/proc/xen/capabilities
]; then
+elif [ -
d "${root}/proc/xen"
]; then
echo xen
echo xen
- if grep -q "control_d"
$root/proc/xen/capabilities
; then
+ if grep -q "control_d"
"${root}/proc/xen/capabilities" 2>/dev/null
; then
echo xen-dom0
else
echo xen-domU
fi
skip_qemu_kvm=true
echo xen-dom0
else
echo xen-domU
fi
skip_qemu_kvm=true
-elif [ -f $root/sys/hypervisor/type ] &&
- grep -q "xen" $root/sys/hypervisor/type; then
+ skip_lkvm=true
+elif [ -f "${root}/sys/hypervisor/type" ] &&
+ grep -q "xen" "${root}/sys/hypervisor/type"; then
# Ordinary kernel with pv_ops. There does not seem to be
# enough information at present to tell whether this is dom0
# or domU. XXX
echo xen
elif [ "$arch" = "ia64" ]; then
# Ordinary kernel with pv_ops. There does not seem to be
# enough information at present to tell whether this is dom0
# or domU. XXX
echo xen
elif [ "$arch" = "ia64" ]; then
- if [ -d
$root/sys/bus/xen -a ! -d $root/sys/bus/xen-backend
]; then
+ if [ -d
"${root}/sys/bus/xen" -a ! -d "${root}/sys/bus/xen-backend"
]; then
# PV-on-HVM drivers installed in a Xen guest.
echo xen
echo xen-hvm
# PV-on-HVM drivers installed in a Xen guest.
echo xen
echo xen-hvm
@@
-230,7
+247,7
@@
fi
# seen that it's Parallels. Xen uses QEMU as the device model, so
# skip this test if we know it is Xen.
# seen that it's Parallels. Xen uses QEMU as the device model, so
# skip this test if we know it is Xen.
-if !
$skip_qemu_kvm
; then
+if !
"$skip_qemu_kvm"
; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
else
if [ "$cpuid" = "KVMKVMKVM" ]; then
echo kvm
else
@@
-238,8
+255,19
@@
if ! $skip_qemu_kvm; then
# option, since /proc/cpuinfo will not contain the QEMU
# string. The long term fix for this would be to export
# another CPUID leaf for non-accelerated qemu.
# option, since /proc/cpuinfo will not contain the QEMU
# string. The long term fix for this would be to export
# another CPUID leaf for non-accelerated qemu.
- if grep -q 'QEMU'
$root/proc/cpuinfo
; then
+ if grep -q 'QEMU'
"${root}/proc/cpuinfo"
; then
echo qemu
fi
fi
fi
echo qemu
fi
fi
fi
+
+if ! "$skip_lkvm"; then
+ if [ "$cpuid" = "LKVMLKVMLKVM" ]; then
+ echo lkvm
+ fi
+fi
+
+# Check for Docker.
+if [ -f "${root}/.dockerinit" ]; then
+ echo docker
+fi