kvm: merge kvm optional to qemu patch from release branch (r3456)

1 files changed, 8 insertions, 8 deletions

diff --git a/kvm b/kvm
index 184c936d..fb7c7f03 100755
--- a/kvm
+++ b/kvm
@@ -88,21 +88,21 @@ if arch == 'x86_64':
     cmd = 'qemu-system-' + arch
 else:
     cmd = 'qemu'
-    
-if options.kvm:
-    local_cmd = 'qemu/' + arch + '-softmmu/' + cmd
-    if os.access(local_cmd, os.F_OK):
-       cmd = local_cmd
-    else:
-       cmd = '/usr/bin/kvm'
+
+local_cmd = 'qemu/' + arch + '-softmmu/' + cmd
+if os.access(local_cmd, os.F_OK):
+    cmd = local_cmd
 else:
-    cmd = 'qemu'
+    cmd = '/usr/bin/kvm'
 
 qemu_args = (cmd, '-cdrom', options.cdrom, '-boot', bootdisk,
              '-L', '/usr/share/qemu', '-hda', disk, '-m', '384',
              '-serial', 'file:/tmp/serial.log',
           )
 
+if not options.kvm:
+    qemu_args += ('-no-kvm',)
+
 if options.debugger:
     qemu_args += ('-s',)