-if [ ! "$is_xen" ]; then
- # Disable this test if we know this is Xen already, because Xen
- # uses QEMU for its device model.
+if ! "$skip_qemu_kvm"; then
+ if [ "$cpuid" = "KVMKVMKVM" ]; then
+ 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
+ # 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
+ # 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
+ echo qemu
+ fi
+ fi
+fi