summary refs log tree commit diff stats
path: root/python/qemu/utils
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-01 10:08:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-07-01 10:08:05 +0100
commitdd62bf14b756821fa293e3465955a41e9d460deb (patch)
tree86e549043122b513008f317f590d9237454c8159 /python/qemu/utils
parent1ec2cd0ce2ca94292ce237becc2c21b4eb9edca0 (diff)
parent5c02c865866fdd2d17e8f5507deb4aa1f74bf59f (diff)
downloadfocaccia-qemu-dd62bf14b756821fa293e3465955a41e9d460deb.tar.gz
focaccia-qemu-dd62bf14b756821fa293e3465955a41e9d460deb.zip
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Pull request

Patch 01/15 fixes the check-python-tox test.

# gpg: Signature made Thu 01 Jul 2021 03:01:20 BST
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jsnow-gitlab/tags/python-pull-request:
  python: Fix broken ReST docstrings
  python: remove auto-generated pyproject.toml file
  python: Update help text on 'make clean', 'make distclean'
  python: Update help text on 'make check', 'make develop'
  python: add 'make check-dev' invocation
  python: only check qemu/ subdir with flake8
  python: Fix .PHONY Make specifiers
  python: update help text for check-tox
  python: rename 'venv-check' target to 'check-pipenv'
  python: Add no-install usage instructions
  python: README.rst touchups
  python: Re-lock pipenv at *oldest* supported versions
  python: Remove global pylint suppressions
  python: expose typing information via PEP 561
  python/qom: Do not use 'err' name at module scope

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'python/qemu/utils')
-rw-r--r--python/qemu/utils/accel.py2
-rw-r--r--python/qemu/utils/py.typed0
2 files changed, 1 insertions, 1 deletions
diff --git a/python/qemu/utils/accel.py b/python/qemu/utils/accel.py
index 297933df2a..386ff640ca 100644
--- a/python/qemu/utils/accel.py
+++ b/python/qemu/utils/accel.py
@@ -36,7 +36,7 @@ def list_accel(qemu_bin: str) -> List[str]:
     List accelerators enabled in the QEMU binary.
 
     @param qemu_bin (str): path to the QEMU binary.
-    @raise Exception: if failed to run `qemu -accel help`
+    @raise Exception: if failed to run ``qemu -accel help``
     @return a list of accelerator names.
     """
     if not qemu_bin:
diff --git a/python/qemu/utils/py.typed b/python/qemu/utils/py.typed
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/python/qemu/utils/py.typed