X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-what.in;h=ed08daefa291a28223dd95f7d18c541103469488;hb=215017d61304ac3638548bd9c14d9d2b69a8fde9;hp=6e9aef11c2df77790b1007115a8f754c2e371c83;hpb=468ae304e6a02bd433c3f282fab9ab0a2f468269;p=virt-what.git diff --git a/virt-what.in b/virt-what.in index 6e9aef1..ed08dae 100644 --- a/virt-what.in +++ b/virt-what.in @@ -30,19 +30,20 @@ set -u root='' skip_qemu_kvm=false +skip_lkvm=false VERSION="@VERSION@" -have_cpuinfo() { +have_cpuinfo () { test -e "${root}/proc/cpuinfo" } -fail() { +fail () { echo "virt-what: $1" >&2 exit 1 } -usage() { +usage () { echo "virt-what [options]" echo "Options:" echo " --help Display this help" @@ -51,24 +52,21 @@ usage() { } # 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 ;; - --test-root) + --test-root=*) # 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 ;; --) shift; break ;; - *) fail "internal error ($1)" ;; + *) fail "unrecognized option '$1'";; esac done +test $# -gt 0 && fail "extra operand '$1'" # Add /sbin and /usr/sbin to the path so we can find system # binaries like dmidecode. @@ -218,6 +216,7 @@ elif [ -d "${root}/proc/xen" ]; then echo xen-domU fi skip_qemu_kvm=true + 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 @@ -262,6 +261,12 @@ if ! "$skip_qemu_kvm"; then fi fi +if ! "$skip_lkvm"; then + if [ "$cpuid" = "LKVMLKVMLKVM" ]; then + echo lkvm + fi +fi + # Check for Docker. if [ -f "${root}/.dockerinit" ]; then echo docker