It looks like this bled forward, this part belongs in the next patch. Can you fix this and re-send?
jsnow@scv ~/s/q/python (review)> make check-dev
ACTIVATE .dev-venv
make[1]: Entering directory '/home/jsnow/src/qemu/python'
JOB ID : f766a463cfc6bd3f0d6286e0653752bb8bc5ea6f
JOB LOG : /home/jsnow/avocado/job-results/job-2021-07-20T13.55-f766a46/job.log
(1/4) tests/flake8.sh: FAIL: Exited with status: '1' (0.36 s)
(2/4) tests/isort.sh: PASS (0.11 s)
(3/4) tests/mypy.sh: FAIL: Exited with status: '1' (0.36 s)
(4/4) tests/pylint.sh: FAIL: Exited with status: '2' (6.62 s)
RESULTS : PASS 1 | ERROR 0 | FAIL 3 | SKIP 0 | WARN 0 | INTERRUPT 0 | CANCEL 0
JOB TIME : 7.80 s
Log file "stdout" content for test "1-tests/flake8.sh" (FAIL):
qemu/aqmp/aqmp_tui.py:30:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:31:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:32:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:33:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:34:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:35:6: F821 undefined name 'Token'
qemu/aqmp/aqmp_tui.py:138:21: F821 undefined name 'lexers'
While you're at it, you might as well rebase on top of AQMP v2.