summaryrefslogtreecommitdiffstats
path: root/scripts/simplebench
diff options
context:
space:
mode:
authorJohn Snow2022-03-21 21:33:13 +0100
committerJohn Snow2022-04-21 17:01:00 +0200
commit28d4f06e0a10750bbf806977608930dd31b8add3 (patch)
tree83d37ca94fe7e37f17886158bd489e66a1845e7d /scripts/simplebench
parentpython/machine: permanently switch to AQMP (diff)
downloadqemu-28d4f06e0a10750bbf806977608930dd31b8add3.tar.gz
qemu-28d4f06e0a10750bbf806977608930dd31b8add3.tar.xz
qemu-28d4f06e0a10750bbf806977608930dd31b8add3.zip
scripts/bench-block-job: switch to AQMP
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>
Diffstat (limited to 'scripts/simplebench')
-rwxr-xr-xscripts/simplebench/bench_block_job.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
index a403c35b08..af9d1646a4 100755
--- a/scripts/simplebench/bench_block_job.py
+++ b/scripts/simplebench/bench_block_job.py
@@ -27,7 +27,6 @@ import json
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: