diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2018-01-19 11:35:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 11:35:49 +0100 |
| commit | fd82d80f664b1b20e201d49c620ec954d1d30b3c (patch) | |
| tree | 8119de7aaabf3b345d07a1b157d326b6b63afd8d /scripts | |
| parent | 599717033068a1f33e965a48d56d2339b71af0c0 (diff) | |
| parent | 44a4dd8e039ea16319f337c3881964759ada73a5 (diff) | |
| download | meta-updater-fd82d80f664b1b20e201d49c620ec954d1d30b3c.tar.gz | |
Merge pull request #233 from advancedtelematic/bugfix/PRO-4252/rocko-selftest-fixes
Fix some basic oe-selftest errors.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qemucommand.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 9a893d8..6b1106d 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py | |||
| @@ -73,7 +73,7 @@ class QemuCommand(object): | |||
| 73 | try: | 73 | try: |
| 74 | check_output(['kvm-ok']) | 74 | check_output(['kvm-ok']) |
| 75 | self.kvm = True | 75 | self.kvm = True |
| 76 | except CalledProcessError: | 76 | except Exception: |
| 77 | self.kvm = False | 77 | self.kvm = False |
| 78 | else: | 78 | else: |
| 79 | self.kvm = args.kvm | 79 | self.kvm = args.kvm |
| @@ -96,7 +96,7 @@ class QemuCommand(object): | |||
| 96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, | 96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, |
| 97 | "-m", "1G", | 97 | "-m", "1G", |
| 98 | "-usb", | 98 | "-usb", |
| 99 | "-usbdevice", "tablet", | 99 | "-device", "usb-tablet", |
| 100 | "-show-cursor", | 100 | "-show-cursor", |
| 101 | "-vga", "std", | 101 | "-vga", "std", |
| 102 | "-net", netuser, | 102 | "-net", netuser, |