qemu-trace2txt: port to clifunction

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-01-22 00:00:00 +00:00
parent 040d37c766
commit 27868f942c
2 changed files with 23 additions and 18 deletions

View File

@@ -1,27 +1,29 @@
#!/usr/bin/env python3
import os
import subprocess
import sys
import common
from shell_helpers import LF
def main():
return self.sh.run_cmd(
[
os.path.join(self.env['qemu_source_dir'], 'scripts/simpletrace.py'), LF,
os.path.join(self.env['qemu_build_dir'], 'trace-events-all'), LF,
os.path.join(self.env['qemu_trace_file']), LF,
],
cmd_file=os.path.join(self.env['run_dir'], 'qemu-trace2txt'),
out_file=self.env['qemu_trace_txt_file'],
show_stdout=False,
)
class Main(common.LkmcCliFunction):
def __init__(self):
super().__init__(
description='''\
Convert a QEMU `-trace exec_tb` to text form.
'''
)
def timed_main(self):
return self.sh.run_cmd(
[
os.path.join(self.env['qemu_source_dir'], 'scripts/simpletrace.py'), LF,
os.path.join(self.env['qemu_build_dir'], 'trace-events-all'), LF,
os.path.join(self.env['qemu_trace_file']), LF,
],
cmd_file=os.path.join(self.env['run_dir'], 'qemu-trace2txt'),
out_file=self.env['qemu_trace_txt_file'],
show_stdout=False,
)
if __name__ == '__main__':
parser = self.get_argparse(argparse_args={
'description': 'Convert a QEMU `-trace exec_tb` to text form.'
})
args = self.setup(parser)
sys.exit(main())
Main().cli_exit()

View File

@@ -169,6 +169,9 @@ class ShellHelpers:
:param extra_env: extra environment variables to add when running the command
:type extra_env: Dict[str,str]
:return: exit status of the command
:rtype: int
'''
if out_file is not None:
stdout = subprocess.PIPE