summaryrefslogtreecommitdiffstats
path: root/scripts/qemucommand.py
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-01-23 16:25:28 +0100
committerGitHub <noreply@github.com>2020-01-23 16:25:28 +0100
commit5163ff50bb45903ca31b5b19220ad9ddf54ee0c1 (patch)
tree55de20ed32d38f62b4fdfaf2fbe0d15b43fca256 /scripts/qemucommand.py
parented1fdcb6e51073c90dcc9e58f894fb1c0fc4b77a (diff)
parentc267c82641991e01097caac042b7237f60afe545 (diff)
downloadmeta-updater-5163ff50bb45903ca31b5b19220ad9ddf54ee0c1.tar.gz
Merge pull request #664 from advancedtelematic/feat/warrior/2020.1
Feat/warrior/2020.1
Diffstat (limited to 'scripts/qemucommand.py')
-rw-r--r--scripts/qemucommand.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index cef434d..8d3ee0e 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -42,6 +42,8 @@ class QemuCommand(object):
42 def __init__(self, args): 42 def __init__(self, args):
43 self.dry_run = args.dry_run 43 self.dry_run = args.dry_run
44 self.overlay = args.overlay 44 self.overlay = args.overlay
45 self.host_fwd = None
46
45 if args.machine: 47 if args.machine:
46 self.machine = args.machine 48 self.machine = args.machine
47 else: 49 else:
@@ -125,10 +127,17 @@ class QemuCommand(object):
125 self.pcap = args.pcap 127 self.pcap = args.pcap
126 self.secondary_network = args.secondary_network 128 self.secondary_network = args.secondary_network
127 129
130 # Append additional port forwarding to QEMU command line.
131 if hasattr(args, 'host_forward'):
132 self.host_fwd = args.host_forward
133
128 def command_line(self): 134 def command_line(self):
129 netuser = 'user,hostfwd=tcp:0.0.0.0:%d-:22,restrict=off' % self.ssh_port 135 netuser = 'user,hostfwd=tcp:0.0.0.0:%d-:22,restrict=off' % self.ssh_port
130 if self.gdb: 136 if self.gdb:
131 netuser += ',hostfwd=tcp:0.0.0.0:2159-:2159' 137 netuser += ',hostfwd=tcp:0.0.0.0:2159-:2159'
138 if self.host_fwd:
139 netuser += ",hostfwd=" + self.host_fwd
140
132 cmdline = [ 141 cmdline = [
133 "qemu-system-x86_64", 142 "qemu-system-x86_64",
134 "-bios", self.bios 143 "-bios", self.bios