diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-01-23 16:24:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-23 16:24:27 +0100 |
| commit | 544eecf0f74c708f531328116bcff4386fb3906f (patch) | |
| tree | c709ee69ea6e6b4f7273d0540c0820b7995cb46d /scripts/qemucommand.py | |
| parent | d61874d62d6c22d72d8d03857516f1d8e6cec789 (diff) | |
| parent | ae69c53b68f6c7a01b1d49d646a3427ba337583b (diff) | |
| download | meta-updater-544eecf0f74c708f531328116bcff4386fb3906f.tar.gz | |
Merge pull request #665 from advancedtelematic/feat/thud/2020.1
Feat/thud/2020.1
Diffstat (limited to 'scripts/qemucommand.py')
| -rw-r--r-- | scripts/qemucommand.py | 9 |
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 |
