mirror of https://github.com/proxmox/mirror_qemu
qemu-iotests: add option to show qemu binary logs on stdout
Using the flag -p, allow the qemu binary to print to stdout. Also create the common function _close_qemu_log_file() to avoid accessing machine.py private fields directly and have duplicate code. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-Id: <20210809090114.64834-16-eesposit@redhat.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>master
parent
bd10a7397e
commit
eb7a91d07a
|
@ -348,6 +348,11 @@ class QEMUMachine:
|
||||||
if self._qmp_connection:
|
if self._qmp_connection:
|
||||||
self._qmp.accept(self._qmp_timer)
|
self._qmp.accept(self._qmp_timer)
|
||||||
|
|
||||||
|
def _close_qemu_log_file(self) -> None:
|
||||||
|
if self._qemu_log_file is not None:
|
||||||
|
self._qemu_log_file.close()
|
||||||
|
self._qemu_log_file = None
|
||||||
|
|
||||||
def _post_shutdown(self) -> None:
|
def _post_shutdown(self) -> None:
|
||||||
"""
|
"""
|
||||||
Called to cleanup the VM instance after the process has exited.
|
Called to cleanup the VM instance after the process has exited.
|
||||||
|
@ -360,9 +365,7 @@ class QEMUMachine:
|
||||||
self._qmp.close()
|
self._qmp.close()
|
||||||
self._qmp_connection = None
|
self._qmp_connection = None
|
||||||
|
|
||||||
if self._qemu_log_file is not None:
|
self._close_qemu_log_file()
|
||||||
self._qemu_log_file.close()
|
|
||||||
self._qemu_log_file = None
|
|
||||||
|
|
||||||
self._load_io_log()
|
self._load_io_log()
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,8 @@ def make_argparser() -> argparse.ArgumentParser:
|
||||||
help='pretty print output for make check')
|
help='pretty print output for make check')
|
||||||
|
|
||||||
p.add_argument('-d', dest='debug', action='store_true', help='debug')
|
p.add_argument('-d', dest='debug', action='store_true', help='debug')
|
||||||
|
p.add_argument('-p', dest='print', action='store_true',
|
||||||
|
help='redirects qemu\'s stdout and stderr to the test output')
|
||||||
p.add_argument('-gdb', action='store_true',
|
p.add_argument('-gdb', action='store_true',
|
||||||
help="start gdbserver with $GDB_OPTIONS options \
|
help="start gdbserver with $GDB_OPTIONS options \
|
||||||
('localhost:12345' if $GDB_OPTIONS is empty)")
|
('localhost:12345' if $GDB_OPTIONS is empty)")
|
||||||
|
@ -119,7 +121,7 @@ if __name__ == '__main__':
|
||||||
aiomode=args.aiomode, cachemode=args.cachemode,
|
aiomode=args.aiomode, cachemode=args.cachemode,
|
||||||
imgopts=args.imgopts, misalign=args.misalign,
|
imgopts=args.imgopts, misalign=args.misalign,
|
||||||
debug=args.debug, valgrind=args.valgrind,
|
debug=args.debug, valgrind=args.valgrind,
|
||||||
gdb=args.gdb)
|
gdb=args.gdb, qprint=args.print)
|
||||||
|
|
||||||
if len(sys.argv) > 1 and sys.argv[-len(args.tests)-1] == '--':
|
if len(sys.argv) > 1 and sys.argv[-len(args.tests)-1] == '--':
|
||||||
if not args.tests:
|
if not args.tests:
|
||||||
|
|
|
@ -79,6 +79,8 @@ qemu_gdb = []
|
||||||
if gdb_qemu_env:
|
if gdb_qemu_env:
|
||||||
qemu_gdb = ['gdbserver'] + gdb_qemu_env.strip().split(' ')
|
qemu_gdb = ['gdbserver'] + gdb_qemu_env.strip().split(' ')
|
||||||
|
|
||||||
|
qemu_print = os.environ.get('PRINT_QEMU', False)
|
||||||
|
|
||||||
imgfmt = os.environ.get('IMGFMT', 'raw')
|
imgfmt = os.environ.get('IMGFMT', 'raw')
|
||||||
imgproto = os.environ.get('IMGPROTO', 'file')
|
imgproto = os.environ.get('IMGPROTO', 'file')
|
||||||
output_dir = os.environ.get('OUTPUT_DIR', '.')
|
output_dir = os.environ.get('OUTPUT_DIR', '.')
|
||||||
|
@ -613,6 +615,12 @@ class VM(qtest.QEMUQtestMachine):
|
||||||
else:
|
else:
|
||||||
os.remove(valgrind_filename)
|
os.remove(valgrind_filename)
|
||||||
|
|
||||||
|
def _pre_launch(self) -> None:
|
||||||
|
super()._pre_launch()
|
||||||
|
if qemu_print:
|
||||||
|
# set QEMU binary output to stdout
|
||||||
|
self._close_qemu_log_file()
|
||||||
|
|
||||||
def add_object(self, opts):
|
def add_object(self, opts):
|
||||||
self._args.append('-object')
|
self._args.append('-object')
|
||||||
self._args.append(opts)
|
self._args.append(opts)
|
||||||
|
|
|
@ -74,7 +74,7 @@ class TestEnv(ContextManager['TestEnv']):
|
||||||
'AIOMODE', 'CACHEMODE', 'VALGRIND_QEMU',
|
'AIOMODE', 'CACHEMODE', 'VALGRIND_QEMU',
|
||||||
'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', 'IMGOPTSSYNTAX',
|
'CACHEMODE_IS_DEFAULT', 'IMGFMT_GENERIC', 'IMGOPTSSYNTAX',
|
||||||
'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE', 'MALLOC_PERTURB_',
|
'IMGKEYSECRET', 'QEMU_DEFAULT_MACHINE', 'MALLOC_PERTURB_',
|
||||||
'GDB_OPTIONS']
|
'GDB_OPTIONS', 'PRINT_QEMU']
|
||||||
|
|
||||||
def prepare_subprocess(self, args: List[str]) -> Dict[str, str]:
|
def prepare_subprocess(self, args: List[str]) -> Dict[str, str]:
|
||||||
if self.debug:
|
if self.debug:
|
||||||
|
@ -181,7 +181,8 @@ class TestEnv(ContextManager['TestEnv']):
|
||||||
misalign: bool = False,
|
misalign: bool = False,
|
||||||
debug: bool = False,
|
debug: bool = False,
|
||||||
valgrind: bool = False,
|
valgrind: bool = False,
|
||||||
gdb: bool = False) -> None:
|
gdb: bool = False,
|
||||||
|
qprint: bool = False) -> None:
|
||||||
self.imgfmt = imgfmt
|
self.imgfmt = imgfmt
|
||||||
self.imgproto = imgproto
|
self.imgproto = imgproto
|
||||||
self.aiomode = aiomode
|
self.aiomode = aiomode
|
||||||
|
@ -189,6 +190,9 @@ class TestEnv(ContextManager['TestEnv']):
|
||||||
self.misalign = misalign
|
self.misalign = misalign
|
||||||
self.debug = debug
|
self.debug = debug
|
||||||
|
|
||||||
|
if qprint:
|
||||||
|
self.print_qemu = 'y'
|
||||||
|
|
||||||
if gdb:
|
if gdb:
|
||||||
self.gdb_options = os.getenv('GDB_OPTIONS', DEF_GDB_OPTIONS)
|
self.gdb_options = os.getenv('GDB_OPTIONS', DEF_GDB_OPTIONS)
|
||||||
if not self.gdb_options:
|
if not self.gdb_options:
|
||||||
|
@ -299,6 +303,7 @@ SOCK_DIR -- {SOCK_DIR}
|
||||||
SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}
|
SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}
|
||||||
GDB_OPTIONS -- {GDB_OPTIONS}
|
GDB_OPTIONS -- {GDB_OPTIONS}
|
||||||
VALGRIND_QEMU -- {VALGRIND_QEMU}
|
VALGRIND_QEMU -- {VALGRIND_QEMU}
|
||||||
|
PRINT_QEMU_OUTPUT -- {PRINT_QEMU}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
args = collections.defaultdict(str, self.get_env())
|
args = collections.defaultdict(str, self.get_env())
|
||||||
|
|
Loading…
Reference in New Issue