1 files changed, 7 insertions, 8 deletions

diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 82a9540..6b1106d 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -46,7 +46,7 @@ class QemuCommand(object):
             if len(machines) == 1:
                 self.machine = machines[0]
             else:
-                raise ValueError("Could not autodetect machine type from %s" % args.dir)
+                raise ValueError("Could not autodetect machine type. More than one entry in %s. Maybe --machine qemux86-64?" % args.dir)
         if args.efi:
             self.bios = 'OVMF.fd'
         else:
@@ -73,7 +73,7 @@ class QemuCommand(object):
             try:
                 check_output(['kvm-ok'])
                 self.kvm = True
-            except CalledProcessError:
+            except Exception:
                 self.kvm = False
         else:
             self.kvm = args.kvm
@@ -96,7 +96,7 @@ class QemuCommand(object):
             "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port,
             "-m", "1G",
             "-usb",
-            "-usbdevice", "tablet",
+            "-device", "usb-tablet",
             "-show-cursor",
             "-vga", "std",
             "-net", netuser,
@@ -118,10 +118,9 @@ class QemuCommand(object):
 
     def img_command_line(self):
         cmdline = [
-        "qemu-img", "create",
-        "-o", "backing_file=%s" % self.image,
-        "-f", "qcow2",
-        self.overlay]
+            "qemu-img", "create",
+            "-o", "backing_file=%s" % self.image,
+            "-f", "qcow2",
+            self.overlay]
         return cmdline
 
-