-if [ ! "$is_xen" ]; then
- # Disable this test if we know this is Xen already, because Xen
- # uses QEMU for its device model.
-
- if grep -q 'QEMU' $root/proc/cpuinfo; then
- if [ "$cpuid" = "KVMKVMKVM" ]; then
- echo kvm
- else
+if [ ! "$skip_qemu_kvm" ]; then
+ if [ "$cpuid" = "KVMKVMKVM" ]; then
+ echo kvm
+ 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