mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-iotests: delay QMP socket timers

Browse Source 
Attaching gdbserver implies that the qmp socket
should wait indefinitely for an answer from QEMU.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210809090114.64834-7-eesposit@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2021-08-09 11:01:04 +02:00 committed by Hanna Reitz
parent cfb9b0b731
commit d3ec2022cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/iotests.py
View File

@ -477,10 +477,14 @@ class Timeout:
self.seconds = seconds self.seconds = seconds
self.errmsg = errmsg self.errmsg = errmsg
def __enter__(self): def __enter__(self):
if qemu_gdb:
return self
signal.signal(signal.SIGALRM, self.timeout) signal.signal(signal.SIGALRM, self.timeout)
signal.setitimer(signal.ITIMER_REAL, self.seconds) signal.setitimer(signal.ITIMER_REAL, self.seconds)
return self return self
def __exit__(self, exc_type, value, traceback): def __exit__(self, exc_type, value, traceback):
if qemu_gdb:
return False
signal.setitimer(signal.ITIMER_REAL, 0) signal.setitimer(signal.ITIMER_REAL, 0)
return False return False
def timeout(self, signum, frame): def timeout(self, signum, frame):
@ -575,7 +579,7 @@ class VM(qtest.QEMUQtestMachine):
def __init__(self, path_suffix=''): def __init__(self, path_suffix=''):
name = "qemu%s-%d" % (path_suffix, os.getpid()) name = "qemu%s-%d" % (path_suffix, os.getpid())
timer = 15.0 timer = 15.0 if not qemu_gdb else None
super().__init__(qemu_prog, qemu_opts, name=name, super().__init__(qemu_prog, qemu_opts, name=name,
base_temp_dir=test_dir, base_temp_dir=test_dir,
socket_scm_helper=socket_scm_helper, socket_scm_helper=socket_scm_helper,