From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Emanuele Giuseppe Esposito <eesposit@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Cleber Rosa <crosa@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [RFC PATCH v2 04/11] qemu-iotests: delay QMP socket timers
Date: Wed, 7 Apr 2021 15:50:14 +0200 [thread overview]
Message-ID: <20210407135021.48330-5-eesposit@redhat.com> (raw)
In-Reply-To: <20210407135021.48330-1-eesposit@redhat.com>
Attaching a gdbserver implies that the qmp socket
should wait indefinitely for an answer from QEMU.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@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
next prev parent reply other threads:[~2021-04-07 13:53 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 13:50 [RFC PATCH v2 00/11] qemu_iotests: improve debugging options Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 01/11] python: qemu: add timer parameter for qmp.accept socket Emanuele Giuseppe Esposito
2021-04-08 19:51 ` John Snow
2021-04-09 16:01 ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 02/11] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine Emanuele Giuseppe Esposito
2021-04-08 19:59 ` John Snow
2021-04-09 16:07 ` Emanuele Giuseppe Esposito
2021-04-09 16:37 ` John Snow
2021-04-07 13:50 ` [RFC PATCH v2 03/11] qemu-iotests: add option to attach gdbserver Emanuele Giuseppe Esposito
2021-04-08 15:40 ` Paolo Bonzini
2021-04-08 16:02 ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` Emanuele Giuseppe Esposito [this message]
2021-04-08 15:40 ` [RFC PATCH v2 04/11] qemu-iotests: delay QMP socket timers Paolo Bonzini
2021-04-08 16:06 ` Emanuele Giuseppe Esposito
2021-04-08 19:03 ` Paolo Bonzini
2021-04-09 16:13 ` Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 05/11] qemu_iotests: insert gdbserver command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 06/11] qemu-iotests: add gdbserver option to script tests too Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 07/11] qemu_iotests: extend the check script to support valgrind for python tests Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 08/11] qemu_iotests: extent QMP socket timeout when using valgrind Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 09/11] qemu_iotests: allow valgrint to print/delete the generated log file Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 10/11] qemu_iotests: insert valgrind command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-04-07 13:50 ` [RFC PATCH v2 11/11] qemu_iotests: add option to show qemu binary logs on stdout Emanuele Giuseppe Esposito
2021-04-08 8:26 ` [RFC PATCH v2 00/11] qemu_iotests: improve debugging options Markus Armbruster
2021-04-08 11:15 ` Emanuele Giuseppe Esposito
2021-04-08 12:39 ` Markus Armbruster
2021-04-08 13:41 ` Emanuele Giuseppe Esposito
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407135021.48330-5-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).