From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>,
Beraldo Leal <bleal@redhat.com>,
qemu-block@nongnu.org, Markus Armbruster <armbru@redhat.com>,
Eduardo Habkost <eduardo@habkost.net>,
Hanna Reitz <hreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Cleber Rosa <crosa@redhat.com>, John Snow <jsnow@redhat.com>
Subject: [PULL 02/17] scripts/bench-block-job: switch to AQMP
Date: Thu, 21 Apr 2022 11:15:45 -0400 [thread overview]
Message-ID: <20220421151600.984189-3-jsnow@redhat.com> (raw)
In-Reply-To: <20220421151600.984189-1-jsnow@redhat.com>
For this commit, we only need to remove accommodations for the
synchronous QMP library.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Acked-by: Hanna Reitz <hreitz@redhat.com>
Message-id: 20220321203315.909411-3-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/simplebench/bench_block_job.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
index a403c35b08f..af9d1646a46 100755
--- a/scripts/simplebench/bench_block_job.py
+++ b/scripts/simplebench/bench_block_job.py
@@ -27,7 +27,6 @@
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
from qemu.machine import QEMUMachine
-from qemu.qmp import QMPConnectError
from qemu.aqmp import ConnectError
@@ -50,7 +49,7 @@ def bench_block_job(cmd, cmd_args, qemu_args):
vm.launch()
except OSError as e:
return {'error': 'popen failed: ' + str(e)}
- except (QMPConnectError, ConnectError, socket.timeout):
+ except (ConnectError, socket.timeout):
return {'error': 'qemu failed: ' + str(vm.get_log())}
try:
--
2.34.1
next prev parent reply other threads:[~2022-04-21 15:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 15:15 [PULL 00/17] Python patches John Snow
2022-04-21 15:15 ` [PULL 01/17] python/machine: permanently switch to AQMP John Snow
2022-04-21 15:15 ` John Snow [this message]
2022-04-21 15:15 ` [PULL 03/17] iotests/mirror-top-perms: " John Snow
2022-04-21 15:15 ` [PULL 04/17] iotests: " John Snow
2022-04-21 15:15 ` [PULL 05/17] python/aqmp: add explicit GPLv2 license to legacy.py John Snow
2022-04-21 15:15 ` [PULL 06/17] python/aqmp: relicense as LGPLv2+ John Snow
2022-04-21 15:15 ` [PULL 07/17] python/qmp-shell: " John Snow
2022-04-21 15:15 ` [PULL 08/17] python/aqmp-tui: " John Snow
2022-04-21 15:15 ` [PULL 09/17] python: temporarily silence pylint duplicate-code warnings John Snow
2022-04-21 15:15 ` [PULL 10/17] python/aqmp: take QMPBadPortError and parse_address from qemu.qmp John Snow
2022-04-21 15:15 ` [PULL 11/17] python/aqmp: fully separate from qmp.QEMUMonitorProtocol John Snow
2022-04-21 15:15 ` [PULL 12/17] python/aqmp: copy qmp docstrings to qemu.aqmp.legacy John Snow
2022-04-21 15:15 ` [PULL 13/17] python: remove the old QMP package John Snow
2022-04-21 15:15 ` [PULL 14/17] python: re-enable pylint duplicate-code warnings John Snow
2022-04-21 15:15 ` [PULL 15/17] python: rename qemu.aqmp to qemu.qmp John Snow
2022-04-21 15:15 ` [PULL 16/17] python: rename 'aqmp-tui' to 'qmp-tui' John Snow
2022-04-21 15:16 ` [PULL 17/17] python/qmp: remove pylint workaround from legacy.py John Snow
2022-04-21 23:45 ` [PULL 00/17] Python patches Richard Henderson
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=20220421151600.984189-3-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=bleal@redhat.com \
--cc=crosa@redhat.com \
--cc=eduardo@habkost.net \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=v.sementsov-og@mail.ru \
--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).