motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-26 11:32:23 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qemu-iotests: add option to attach gdbserver

Browse source 
Define -gdb flag and GDB_OPTIONS environment variable
to python tests to attach a gdbserver to each qemu instance.
This patch only adds and parses this flag, it does not yet add
the implementation for it.

if -gdb is not provided but $GDB_OPTIONS is set, ignore the
environment variable.

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-6-eesposit@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2021-08-09 11:01:03 +02:00 • committed by Hanna Reitz
parent 0193767b25
commit cfb9b0b731
3 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/qemu-iotests/check
View file

@ -36,6 +36,9 @@ 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('-gdb', action='store_true',
help="start gdbserver with $GDB_OPTIONS options \
('localhost:12345' if $GDB_OPTIONS is empty)")
p.add_argument('-misalign', action='store_true', p.add_argument('-misalign', action='store_true',
help='misalign memory allocations') help='misalign memory allocations')
p.add_argument('--color', choices=['on', 'off', 'auto'], p.add_argument('--color', choices=['on', 'off', 'auto'],
@ -114,7 +117,8 @@ if __name__ == '__main__':
env = TestEnv(imgfmt=args.imgfmt, imgproto=args.imgproto, env = TestEnv(imgfmt=args.imgfmt, imgproto=args.imgproto,
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)
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:

5
tests/qemu-iotests/iotests.py
View file

@ -74,6 +74,11 @@ if os.environ.get('QEMU_NBD_OPTIONS'):
qemu_prog = os.environ.get('QEMU_PROG', 'qemu') qemu_prog = os.environ.get('QEMU_PROG', 'qemu')
qemu_opts = os.environ.get('QEMU_OPTIONS', '').strip().split(' ') qemu_opts = os.environ.get('QEMU_OPTIONS', '').strip().split(' ')
gdb_qemu_env = os.environ.get('GDB_OPTIONS')
qemu_gdb = []
if gdb_qemu_env:
qemu_gdb = ['gdbserver'] + gdb_qemu_env.strip().split(' ')
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', '.')

17
tests/qemu-iotests/testenv.py
View file

@ -27,6 +27,7 @@ import subprocess
import glob import glob
from typing import List, Dict, Any, Optional, ContextManager from typing import List, Dict, Any, Optional, ContextManager
DEF_GDB_OPTIONS = 'localhost:12345'
def isxfile(path: str) -> bool: def isxfile(path: str) -> bool:
return os.path.isfile(path) and os.access(path, os.X_OK) return os.path.isfile(path) and os.access(path, os.X_OK)
@ -72,7 +73,8 @@ class TestEnv(ContextManager['TestEnv']):
'QEMU_NBD_OPTIONS', 'IMGOPTS', 'IMGFMT', 'IMGPROTO', 'QEMU_NBD_OPTIONS', 'IMGOPTS', 'IMGFMT', 'IMGPROTO',
'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']
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:
@ -178,7 +180,8 @@ class TestEnv(ContextManager['TestEnv']):
imgopts: Optional[str] = None, imgopts: Optional[str] = None,
misalign: bool = False, misalign: bool = False,
debug: bool = False, debug: bool = False,
valgrind: bool = False) -> None: valgrind: bool = False,
gdb: bool = False) -> None:
self.imgfmt = imgfmt self.imgfmt = imgfmt
self.imgproto = imgproto self.imgproto = imgproto
self.aiomode = aiomode self.aiomode = aiomode
@ -186,6 +189,15 @@ class TestEnv(ContextManager['TestEnv']):
self.misalign = misalign self.misalign = misalign
self.debug = debug self.debug = debug
if gdb:
self.gdb_options = os.getenv('GDB_OPTIONS', DEF_GDB_OPTIONS)
if not self.gdb_options:
# cover the case 'export GDB_OPTIONS='
self.gdb_options = DEF_GDB_OPTIONS
elif 'GDB_OPTIONS' in os.environ:
# to not propagate it in prepare_subprocess()
del os.environ['GDB_OPTIONS']
if valgrind: if valgrind:
self.valgrind_qemu = 'y' self.valgrind_qemu = 'y'
@ -285,6 +297,7 @@ PLATFORM -- {platform}
TEST_DIR -- {TEST_DIR} TEST_DIR -- {TEST_DIR}
SOCK_DIR -- {SOCK_DIR} SOCK_DIR -- {SOCK_DIR}
SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER} SOCKET_SCM_HELPER -- {SOCKET_SCM_HELPER}
GDB_OPTIONS -- {GDB_OPTIONS}
""" """
args = collections.defaultdict(str, self.get_env()) args = collections.defaultdict(str, self.get_env())