Commit c348b54a authored Sep 22, 2017 by Peter Maydell

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>

parents bef81b3e ad904f66

MAINTAINERS

+8 −0

Original line number	Diff line number	Diff line
		@@ -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>

scripts/qemu.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -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