diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-22 16:15:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-22 16:15:23 +0100 |
| commit | c348b54ab5c3e6c80fbf365b671974fd92f39113 (patch) | |
| tree | 59fd526043b91a48f6d9d0c1203c2dded9f1fbb8 | |
| parent | bef81b3eb521f2825d85b8ddf246c81a28dcef35 (diff) | |
| parent | ad904f6689f1ced282b413cb904c166f294a73ee (diff) | |
| download | qemu-c348b54ab5c3e6c80fbf365b671974fd92f39113.tar.gz | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2017-09-22
* MAINTAINERS update
* Fix logging issue on test scripts using qemu.py
# gpg: Signature made Fri 22 Sep 2017 15:41:43 BST
# gpg: using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
MAINTAINERS: Add Python scripts
qemu.py: Call logging.basicConfig() automatically
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | MAINTAINERS | 8 | ||||
| -rw-r--r-- | scripts/qemu.py | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 762e37bfd6..ffcd25bf1f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1403,6 +1403,14 @@ S: Maintained F: include/sysemu/cryptodev*.h F: backends/cryptodev*.c +Python scripts +M: Eduardo Habkost <ehabkost@redhat.com> +M: Cleber Rosa <crosa@redhat.com> +S: Odd fixes +F: scripts/qmp/* +F: scripts/*.py +F: tests/*.py + QAPI M: Markus Armbruster <armbru@redhat.com> M: Michael Roth <mdroth@linux.vnet.ibm.com> diff --git a/scripts/qemu.py b/scripts/qemu.py index 2b5c2accb5..c9a106fbce 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -89,6 +89,9 @@ class QEMUMachine(object): self._qmp = None self._qemu_full_args = None + # just in case logging wasn't configured by the main script: + logging.basicConfig(level=(logging.DEBUG if debug else logging.WARN)) + def __enter__(self): return self |