run: --debug-vm-args: imply --debug-vm

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-02-05 00:00:00 +00:00
parent 125d14805f
commit 325bef81bb

4
run
View File

@@ -44,7 +44,7 @@ Ctrl +C kills the QEMU simulator instead of being passed to the guest.
) )
self.add_argument( self.add_argument(
'--debug-vm-args', default='', '--debug-vm-args', default='',
help='Pass arguments to GDB.' help='Pass arguments to GDB. Implies --debug-vm.'
) )
self.add_argument( self.add_argument(
'--dtb', '--dtb',
@@ -226,7 +226,7 @@ Run QEMU with VNC instead of the default SDL. Connect to it with:
extra_qemu_args = [] extra_qemu_args = []
if self.env['tmux_args'] is not None: if self.env['tmux_args'] is not None:
self.env['tmux'] = True self.env['tmux'] = True
if self.env['debug_vm']: if self.env['debug_vm'] or self.env['debug_vm_args']:
debug_vm = ['gdb', LF, '-q', LF] + self.sh.shlex_split(self.env['debug_vm_args']) + ['--args', LF] debug_vm = ['gdb', LF, '-q', LF] + self.sh.shlex_split(self.env['debug_vm_args']) + ['--args', LF]
else: else:
debug_vm = [] debug_vm = []