# Handle the command line arguments, if any.
while test $# -gt 0; do
case "$1" in
- --help) usage ;;
+ --help) usage ;;
--test-root=*)
# Deliberately undocumented: used for 'make check'.
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 "unrecognized option '$1'";;
+ -v|--version) echo "$VERSION"; exit 0 ;;
+ --) shift; break ;;
+ *) fail "unrecognized option '$1'";;
esac
done
test $# -gt 0 && fail "extra operand '$1'"
if ! "$skip_qemu_kvm"; then
if [ "$cpuid" = "KVMKVMKVM" ]; then
- echo kvm
+ echo kvm
+ elif echo "$dmi" | grep -q 'Product Name: KVM'; then
+ echo kvm
+ skip_lkvm=true
+ elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
+ # The test for KVM above failed, so now we know we're
+ # not using KVM acceleration.
+ echo qemu
+ skip_lkvm=true
elif [ "$arch" = "arm" ] || [ "$arch" = "aarch64" ]; then
if [ -d "${root}/proc/device-tree" ] &&
ls "${root}/proc/device-tree" | grep -q "fw-cfg"; then
# using KVM acceleration or not.
echo qemu
skip_lkvm=true
- elif echo "$dmi" | grep -q 'Manufacturer: QEMU'; then
- # We don't have enough information to determine if we're
- # using KVM acceleration or not.
- echo qemu
- skip_lkvm=true
fi
else
# XXX This is known to fail for qemu with the explicit -cpu
# 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
- echo qemu
- fi
+ echo qemu
+ fi
fi
fi
if [ -d "${root}/proc/device-tree" ] &&
grep -q "dummy-virt" "${root}/proc/device-tree/compatible"; then
echo lkvm
- fi
+ fi
fi
fi
# Check for Docker.
if [ -f "${root}/.dockerinit" ]; then
- echo docker
+ echo docker
fi