From 84baa1c3d8f996f7daf2d8aa3d26197378218f21 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 18 Jan 2018 18:36:33 +0100 Subject: Fix some basic oe-selftest errors. Grub, HSM, and qemu hostname tests still fail for reasons I haven't figured out yet. --- scripts/qemucommand.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/qemucommand.py') diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 9a893d8..7ae9381 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py @@ -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, -- cgit v1.2.3-54-g00ecf From 44a4dd8e039ea16319f337c3881964759ada73a5 Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Fri, 19 Jan 2018 09:16:49 +0100 Subject: More general exception handler for `kvm-ok` If the program is not in PATH, `FileNotFoundError` is raised --- scripts/qemucommand.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/qemucommand.py') diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 7ae9381..6b1106d 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py @@ -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 -- cgit v1.2.3-54-g00ecf