diff options
author | Phil Wise <phil@advancedtelematic.com> | 2017-11-16 11:01:25 +0100 |
---|---|---|
committer | Phil Wise <phil@advancedtelematic.com> | 2017-11-16 11:07:49 +0100 |
commit | 24e5a6d45886365cecce74c2c9aa1cfd8c0da69a (patch) | |
tree | 2c296be453e262a347d4914d2359e7e298c1f3e2 /scripts/run-qemu-ota | |
parent | 0b1fd4b3c456a64e40a7ff1125f005c0b72eafd8 (diff) | |
download | meta-updater-24e5a6d45886365cecce74c2c9aa1cfd8c0da69a.tar.gz |
Autodetect KVM
Autodetect KVM by using the 'kvm-ok' command line tool. This has two benefits:
Firstly, it improves the UX of run-qemu-ota when working on machines without
KVM (e.g. AWS). Previously, people had to use the --no-kvm option in these
cases.
Secondary, it makes oe-selftest usable on machines without KVM. Our tests call
run-qemu-ota, and we want to able to run them on machines without KVM.
Diffstat (limited to 'scripts/run-qemu-ota')
-rwxr-xr-x | scripts/run-qemu-ota | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota index 8e25197..56e4fbc 100755 --- a/scripts/run-qemu-ota +++ b/scripts/run-qemu-ota | |||
@@ -21,7 +21,11 @@ def main(): | |||
21 | 'OSTREE_BOOTLOADER = "grub" and OVMF.fd firmware to be installed (try "apt install ovmf")', | 21 | 'OSTREE_BOOTLOADER = "grub" and OVMF.fd firmware to be installed (try "apt install ovmf")', |
22 | action='store_true') | 22 | action='store_true') |
23 | parser.add_argument('--machine', default=None, help="Target MACHINE") | 23 | parser.add_argument('--machine', default=None, help="Target MACHINE") |
24 | parser.add_argument('--no-kvm', help='Disable KVM in QEMU', action='store_true') | 24 | kvm_group = parser.add_argument_group() |
25 | kvm_group.add_argument('--force-kvm', help='Force use of KVM (default is to autodetect)', | ||
26 | dest='kvm', action='store_true', default=None) | ||
27 | kvm_group.add_argument('--no-kvm', help='Disable KVM in QEMU', | ||
28 | dest='kvm', action='store_false') | ||
25 | parser.add_argument('--no-gui', help='Disable GUI', action='store_true') | 29 | parser.add_argument('--no-gui', help='Disable GUI', action='store_true') |
26 | parser.add_argument('--gdb', help='Export gdbserver port 2159 from the image', action='store_true') | 30 | parser.add_argument('--gdb', help='Export gdbserver port 2159 from the image', action='store_true') |
27 | parser.add_argument('--pcap', default=None, help='Dump all network traffic') | 31 | parser.add_argument('--pcap', default=None, help='Dump all network traffic') |