3rd-party/linux-kernel-module-cheat
1
0
Fork 0
mirror of https://github.com/cirosantilli/linux-kernel-module-cheat.git synced 2026-01-23 02:05:57 +01:00
Code Issues Releases Wiki Activity

run: fix --kvm

Browse Source
This commit is contained in:
Ciro Santilli 六四事件 法轮功
2018-09-15 15:42:20 +01:00
parent 4aa429f9ca
commit 14a544a13b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
run
View File

@@ -50,7 +50,7 @@ def main(args, extra_args=None):
if args.kernel_cli is not None: if args.kernel_cli is not None:
kernel_cli += ' {}'.format(args.kernel_cli) kernel_cli += ' {}'.format(args.kernel_cli)
kernel_cli_after_dash = '' kernel_cli_after_dash = ''
extra_emulator_args = args.extra_emulator_args.copy() extra_emulator_args = []
extra_qemu_args = [] extra_qemu_args = []
if args.debug_vm: if args.debug_vm:
debug_vm = ['gdb', '-q', '-ex', 'start', '--args'] debug_vm = ['gdb', '-q', '-ex', 'start', '--args']
@@ -157,6 +157,7 @@ def main(args, extra_args=None):
'--machine-type', 'VExpress_GEM5_V1', '--machine-type', 'VExpress_GEM5_V1',
] ]
else: else:
extra_emulator_args.extend(extra_qemu_args)
os.makedirs(common.run_dir, exist_ok=True) os.makedirs(common.run_dir, exist_ok=True)
if args.debug_vm: if args.debug_vm:
serial_monitor = [] serial_monitor = []
@@ -165,13 +166,12 @@ def main(args, extra_args=None):
if args.kvm: if args.kvm:
extra_emulator_args.append('-enable-kvm') extra_emulator_args.append('-enable-kvm')
if args.kgdb: if args.kgdb:
extra_qemu_args.extend(['-serial', 'tcp::{},server,nowait'.format(common.gdb_port)]) extra_emulator_args.extend(['-serial', 'tcp::{},server,nowait'.format(common.gdb_port)])
if args.prebuilt: if args.prebuilt:
common.mkdir() common.mkdir()
qemu_executable = "qemu-system-{}".format(args.arch) qemu_executable = "qemu-system-{}".format(args.arch)
else: else:
qemu_executable = common.qemu_executable qemu_executable = common.qemu_executable
extra_emulator_args = extra_qemu_args + args.extra_emulator_args
cmd = ( cmd = (
debug_vm + debug_vm +
[ [
@@ -275,7 +275,8 @@ def main(args, extra_args=None):
"sleep 2;./rungdb -a '{}' -L '{}' -n '{}' {}" \ "sleep 2;./rungdb -a '{}' -L '{}' -n '{}' {}" \
.format(args.arch, args.linux_build_id, args.run_id, args.tmux_args) .format(args.arch, args.linux_build_id, args.run_id, args.tmux_args)
]) ])
cmd += extra_emulator_args cmd.extend(extra_emulator_args)
cmd.extend(args.extra_emulator_args)
if debug_vm or args.terminal: if debug_vm or args.terminal:
out_file = None out_file = None
else: else: