From: John Snow <jsnow@redhat.com>
To: Emanuele Giuseppe Esposito <eesposit@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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>
Subject: Re: [PATCH v6 01/16] python: qemu: add timer parameter for qmp.accept socket
Date: Tue, 22 Jun 2021 10:46:48 -0400 [thread overview]
Message-ID: <81e14aa0-6ee5-d470-7314-e252264d50ee@redhat.com> (raw)
In-Reply-To: <20210621103337.36637-2-eesposit@redhat.com>
On 6/21/21 6:33 AM, Emanuele Giuseppe Esposito wrote:
> Also add a new _qmp_timer field to the QEMUMachine class.
>
> Let's change the default socket timeout to None, so that if
> a subclass needs to add a timer, it can be done by modifying
> this private field.
>
> At the same time, restore the timer to be 15 seconds in iotests.py, to
> give an upper bound to the QMP monitor test command execution.
>
> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
LGTM, thank you for your patience while I re-settled the Python
subcomponent.
Reviewed-by: John Snow <jsnow@redhat.com>
and, for patches 1-3; I am happy with these being staged by a block
subsystem maintainer:
Acked-by: John Snow <jsnow@redhat.com>
--js
> ---
> python/qemu/machine/machine.py | 7 +++++--
> python/qemu/machine/qtest.py | 5 +++--
> tests/qemu-iotests/iotests.py | 3 ++-
> 3 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
> index b62435528e..fdf2fc0e9c 100644
> --- a/python/qemu/machine/machine.py
> +++ b/python/qemu/machine/machine.py
> @@ -95,7 +95,8 @@ def __init__(self,
> socket_scm_helper: Optional[str] = None,
> sock_dir: Optional[str] = None,
> drain_console: bool = False,
> - console_log: Optional[str] = None):
> + console_log: Optional[str] = None,
> + qmp_timer: Optional[float] = None):
> '''
> Initialize a QEMUMachine
>
> @@ -109,6 +110,7 @@ def __init__(self,
> @param sock_dir: where to create socket (defaults to base_temp_dir)
> @param drain_console: (optional) True to drain console socket to buffer
> @param console_log: (optional) path to console log file
> + @param qmp_timer: (optional) default QMP socket timeout
> @note: Qemu process is not started until launch() is used.
> '''
> # Direct user configuration
> @@ -116,6 +118,7 @@ def __init__(self,
> self._binary = binary
> self._args = list(args)
> self._wrapper = wrapper
> + self._qmp_timer = qmp_timer
>
> self._name = name or "qemu-%d" % os.getpid()
> self._base_temp_dir = base_temp_dir
> @@ -333,7 +336,7 @@ def _pre_launch(self) -> None:
>
> def _post_launch(self) -> None:
> if self._qmp_connection:
> - self._qmp.accept()
> + self._qmp.accept(self._qmp_timer)
>
> def _post_shutdown(self) -> None:
> """
> diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py
> index 93700684d1..33a86a9d69 100644
> --- a/python/qemu/machine/qtest.py
> +++ b/python/qemu/machine/qtest.py
> @@ -115,14 +115,15 @@ def __init__(self,
> name: Optional[str] = None,
> base_temp_dir: str = "/var/tmp",
> socket_scm_helper: Optional[str] = None,
> - sock_dir: Optional[str] = None):
> + sock_dir: Optional[str] = None,
> + qmp_timer: Optional[float] = None):
> if name is None:
> name = "qemu-%d" % os.getpid()
> if sock_dir is None:
> sock_dir = base_temp_dir
> super().__init__(binary, args, name=name, base_temp_dir=base_temp_dir,
> socket_scm_helper=socket_scm_helper,
> - sock_dir=sock_dir)
> + sock_dir=sock_dir, qmp_timer=qmp_timer)
> self._qtest: Optional[QEMUQtestProtocol] = None
> self._qtest_path = os.path.join(sock_dir, name + "-qtest.sock")
>
> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 89663dac06..6b0db4ce54 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -570,10 +570,11 @@ class VM(qtest.QEMUQtestMachine):
>
> def __init__(self, path_suffix=''):
> name = "qemu%s-%d" % (path_suffix, os.getpid())
> + timer = 15.0
> super().__init__(qemu_prog, qemu_opts, name=name,
> base_temp_dir=test_dir,
> socket_scm_helper=socket_scm_helper,
> - sock_dir=sock_dir)
> + sock_dir=sock_dir, qmp_timer=timer)
> self._num_drives = 0
>
> def add_object(self, opts):
>
next prev parent reply other threads:[~2021-06-22 14:47 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 10:33 [PATCH v6 00/16] qemu_iotests: improve debugging options Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 01/16] python: qemu: add timer parameter for qmp.accept socket Emanuele Giuseppe Esposito
2021-06-22 14:46 ` John Snow [this message]
2021-06-21 10:33 ` [PATCH v6 02/16] python: Reduce strictness of pylint's duplicate-code check Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 03/16] python: qemu: pass the wrapper field from QEMUQtestmachine to QEMUMachine Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 04/16] docs/devel/testing: add debug section to the QEMU iotests chapter Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 05/16] qemu-iotests: add option to attach gdbserver Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 06/16] qemu-iotests: delay QMP socket timers Emanuele Giuseppe Esposito
2021-06-22 10:50 ` Vladimir Sementsov-Ogievskiy
2021-06-22 11:04 ` Emanuele Giuseppe Esposito
2021-06-22 11:12 ` Vladimir Sementsov-Ogievskiy
2021-06-21 10:33 ` [PATCH v6 07/16] qemu_iotests: insert gdbserver command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 08/16] qemu-iotests: add gdbserver option to script tests too Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 09/16] docs/devel/testing: add -gdb option to the debugging section of QEMU iotests Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 10/16] qemu-iotests: extend the check script to prepare supporting valgrind for python tests Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 11/16] qemu-iotests: extend QMP socket timeout when using valgrind Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 12/16] qemu-iotests: allow valgrind to read/delete the generated log file Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 13/16] qemu-iotests: insert valgrind command line as wrapper for qemu binary Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 14/16] docs/devel/testing: add -valgrind option to the debug section of QEMU iotests Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 15/16] qemu-iotests: add option to show qemu binary logs on stdout Emanuele Giuseppe Esposito
2021-06-21 10:33 ` [PATCH v6 16/16] docs/devel/testing: add -p option to the debug section of QEMU iotests 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=81e14aa0-6ee5-d470-7314-e252264d50ee@redhat.com \
--to=jsnow@redhat.com \
--cc=crosa@redhat.com \
--cc=eesposit@redhat.com \
--cc=ehabkost@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).