diff options
author | cajun-rat <phil@advancedtelematic.com> | 2017-11-16 17:35:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 17:35:11 +0100 |
commit | e47cd9155ca2aaab08029b5bd0fd78dc1e3e1c01 (patch) | |
tree | 807e338192140cdff21d1f22aa7b5e862cbb9434 /scripts/run-qemu-ota | |
parent | af1cc1ef3cf5cdff903249eca9111174aafc5924 (diff) | |
parent | 24e5a6d45886365cecce74c2c9aa1cfd8c0da69a (diff) | |
download | meta-updater-e47cd9155ca2aaab08029b5bd0fd78dc1e3e1c01.tar.gz |
Merge pull request #178 from advancedtelematic/feat/autodetect-kvm
Autodetect kvm
Diffstat (limited to 'scripts/run-qemu-ota')
-rwxr-xr-x | scripts/run-qemu-ota | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/scripts/run-qemu-ota b/scripts/run-qemu-ota index 5f9cebe..56e4fbc 100755 --- a/scripts/run-qemu-ota +++ b/scripts/run-qemu-ota | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | from argparse import ArgumentParser | 3 | from argparse import ArgumentParser |
4 | from subprocess import Popen | 4 | from subprocess import Popen |
5 | from os.path import exists, join | 5 | from os.path import exists |
6 | import sys | 6 | import sys |
7 | from qemucommand import QemuCommand | 7 | from qemucommand import QemuCommand |
8 | 8 | ||
@@ -21,11 +21,18 @@ 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') |
28 | parser.add_argument('-o', '--overlay', type=str, metavar='file.cow', help='Use an overlay storage image file. Will be created if it does not exist. This option lets you have a persistent image without modifying the underlying image file, permitting multiple different persistent machines.') | 32 | parser.add_argument('-o', '--overlay', type=str, metavar='file.cow', |
33 | help='Use an overlay storage image file. Will be created if it does not exist. ' + | ||
34 | 'This option lets you have a persistent image without modifying the underlying image ' + | ||
35 | 'file, permitting multiple different persistent machines.') | ||
29 | parser.add_argument('-n', '--dry-run', help='Print qemu command line rather then run it', action='store_true') | 36 | parser.add_argument('-n', '--dry-run', help='Print qemu command line rather then run it', action='store_true') |
30 | args = parser.parse_args() | 37 | args = parser.parse_args() |
31 | try: | 38 | try: |