Attaching a gdbserver implies that the qmp socket
should wait indefinitely for an answer from QEMU.
Signed-off-by: Emanuele Giuseppe Esposito <eespo...@redhat.com>
---
python/qemu/machine.py | 4 +++-
tests/qemu-iotests/iotests.py | 21 +++++++++++++++++----
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 18d32ebe45..284b73385f 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -408,7 +408,9 @@ def _launch(self) -> None:
stderr=subprocess.STDOUT,
shell=False,
close_fds=False)
- self._post_launch()
+
+ timer = None if 'gdbserver' in self._wrapper else 15.0
+ self._post_launch(timer)
def _early_cleanup(self) -> None:
"""
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 05d0dc0751..17f07710db 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -686,7 +686,10 @@ def qmp_to_opts(self, obj):
def get_qmp_events_filtered(self, wait=60.0):
result = []
- for ev in self.get_qmp_events(wait=wait):
+ qmp_wait = wait
+ if qemu_gdb:
+ qmp_wait = 0.0
+ for ev in self.get_qmp_events(wait=qmp_wait):
result.append(filter_qmp_event(ev))
return result
@@ -987,13 +990,17 @@ def cancel_and_wait(self, drive='drive0', force=False,
result = self.vm.qmp('block-job-cancel', device=drive, force=force)
self.assert_qmp(result, 'return', {})
+ qmp_wait = wait
+ if qemu_gdb:
+ qmp_wait = 0.0
+
if resume:
self.vm.resume_drive(drive)
cancelled = False
result = None
while not cancelled:
- for event in self.vm.get_qmp_events(wait=wait):
+ for event in self.vm.get_qmp_events(wait=qmp_wait):
if event['event'] == 'BLOCK_JOB_COMPLETED' or \
event['event'] == 'BLOCK_JOB_CANCELLED':
self.assert_qmp(event, 'data/device', drive)
@@ -1009,8 +1016,11 @@ def cancel_and_wait(self, drive='drive0', force=False,
def wait_until_completed(self, drive='drive0', check_offset=True,
wait=60.0, error=None):
'''Wait for a block job to finish, returning the event'''
+ qmp_wait = wait
+ if qemu_gdb:
+ qmp_wait = 0.0
while True:
- for event in self.vm.get_qmp_events(wait=wait):
+ for event in self.vm.get_qmp_events(wait=qmp_wait):
if event['event'] == 'BLOCK_JOB_COMPLETED':
self.assert_qmp(event, 'data/device', drive)
if error is None:
@@ -1054,7 +1064,10 @@ def complete_and_wait(self, drive='drive0',
wait_ready=True,
self.assertTrue(event['data']['type'] in ['mirror', 'commit'])
def pause_wait(self, job_id='job0'):
- with Timeout(3, "Timeout waiting for job to pause"):
+ def_timeout = 3
+ if qemu_gdb:
+ def_timeout = 3000
+ with Timeout(def_timeout, "Timeout waiting for job to pause"):
while True:
result = self.vm.qmp('query-block-jobs')
found = False
--
2.30.2
