* [Qemu-devel] [PULL 1/5] iotests: Set up Python logging
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
@ 2017-10-11 18:50 ` Eduardo Habkost
2017-10-11 18:51 ` [Qemu-devel] [PULL 2/5] basevm: Call logging.basicConfig() Eduardo Habkost
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-11 18:50 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Cleber Rosa, Kevin Wolf, Max Reitz, qemu-block
Set up Python logging module instead of relying on
QEMUMachine._debug to enable debugging messages.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170927130339.21444-3-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Lukáš Doktor <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/qemu-iotests/iotests.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 1af117e37d..36a7757aaf 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -28,6 +28,7 @@ import qtest
import struct
import json
import signal
+import logging
# This will not work if arguments contain spaces but is necessary if we
@@ -467,6 +468,8 @@ def main(supported_fmts=[], supported_oses=['linux']):
else:
output = StringIO.StringIO()
+ logging.basicConfig(level=(logging.DEBUG if debug else logging.WARN))
+
class MyTestRunner(unittest.TextTestRunner):
def __init__(self, stream=output, descriptions=True, verbosity=verbosity):
unittest.TextTestRunner.__init__(self, stream, descriptions, verbosity)
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 2/5] basevm: Call logging.basicConfig()
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
2017-10-11 18:50 ` [Qemu-devel] [PULL 1/5] iotests: Set up Python logging Eduardo Habkost
@ 2017-10-11 18:51 ` Eduardo Habkost
2017-10-11 18:51 ` [Qemu-devel] [PULL 3/5] guestperf: Configure logging on all shell frontends Eduardo Habkost
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-11 18:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Cleber Rosa, Alex Bennée, Fam Zheng,
Philippe Mathieu-Daudé
Just setting level=DEBUG when debug is enabled is not enough: we
need to set up a log handler if we want debug messages generated
using logging.getLogger(...).debug() to be printed.
This was not a problem before because logging.debug() calls
logging.basicConfig() implicitly, but it's safer to not rely on
that.
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Cc: Fam Zheng <famz@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170927130339.21444-4-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Lukáš Doktor <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/vm/basevm.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 3c863bc237..686d88decf 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -227,8 +227,8 @@ def main(vmcls):
if not argv and not args.build_qemu and not args.build_image:
print "Nothing to do?"
return 1
- if args.debug:
- logging.getLogger().setLevel(logging.DEBUG)
+ logging.basicConfig(level=(logging.DEBUG if args.debug
+ else logging.WARN))
vm = vmcls(debug=args.debug, vcpus=args.jobs)
if args.build_image:
if os.path.exists(args.image) and not args.force:
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 3/5] guestperf: Configure logging on all shell frontends
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
2017-10-11 18:50 ` [Qemu-devel] [PULL 1/5] iotests: Set up Python logging Eduardo Habkost
2017-10-11 18:51 ` [Qemu-devel] [PULL 2/5] basevm: Call logging.basicConfig() Eduardo Habkost
@ 2017-10-11 18:51 ` Eduardo Habkost
2017-10-11 18:51 ` [Qemu-devel] [PULL 4/5] scripts: Remove debug parameter from QEMUMonitorProtocol Eduardo Habkost
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-11 18:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Cleber Rosa, Daniel P . Berrange
The logging module will eventually replace the 'debug' parameter
in QEMUMachine and QEMUMonitorProtocol.
Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171005172013.3098-2-ehabkost@redhat.com>
Reviewed-by: Lukáš Doktor <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/migration/guestperf/shell.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/migration/guestperf/shell.py b/tests/migration/guestperf/shell.py
index 7992459a97..b272978f47 100644
--- a/tests/migration/guestperf/shell.py
+++ b/tests/migration/guestperf/shell.py
@@ -26,6 +26,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__),
import argparse
import fnmatch
import platform
+import logging
from guestperf.hardware import Hardware
from guestperf.engine import Engine
@@ -147,6 +148,10 @@ class Shell(BaseShell):
def run(self, argv):
args = self._parser.parse_args(argv)
+ logging.basicConfig(level=(logging.DEBUG if args.debug else
+ logging.INFO if args.verbose else
+ logging.WARN))
+
engine = self.get_engine(args)
hardware = self.get_hardware(args)
@@ -179,6 +184,10 @@ class BatchShell(BaseShell):
def run(self, argv):
args = self._parser.parse_args(argv)
+ logging.basicConfig(level=(logging.DEBUG if args.debug else
+ logging.INFO if args.verbose else
+ logging.WARN))
+
engine = self.get_engine(args)
hardware = self.get_hardware(args)
@@ -231,6 +240,10 @@ class PlotShell(object):
def run(self, argv):
args = self._parser.parse_args(argv)
+ logging.basicConfig(level=(logging.DEBUG if args.debug else
+ logging.INFO if args.verbose else
+ logging.WARN))
+
if len(args.reports) == 0:
print >>sys.stderr, "At least one report required"
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 4/5] scripts: Remove debug parameter from QEMUMonitorProtocol
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
` (2 preceding siblings ...)
2017-10-11 18:51 ` [Qemu-devel] [PULL 3/5] guestperf: Configure logging on all shell frontends Eduardo Habkost
@ 2017-10-11 18:51 ` Eduardo Habkost
2017-10-11 18:51 ` [Qemu-devel] [PULL 5/5] scripts: Remove debug parameter from QEMUMachine Eduardo Habkost
2017-10-12 10:04 ` [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-11 18:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel
Cc: Cleber Rosa, Alex Bennée, Fam Zheng,
Philippe Mathieu-Daudé
Use logging module for the QMP debug messages. The only scripts
that set debug=True are iotests.py and guestperf/engine.py, and
they already call logging.basicConfig() to set up logging.
Scripts that don't configure logging are safe as long as they
don't need debugging output, because debug messages don't trigger
the "No handlers could be found for logger" message from the
Python logging module.
Scripts that already configure logging but don't use debug=True
(e.g. scripts/vm/basevm.py) will get QMP debugging enabled for
free.
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Cc: Fam Zheng <famz@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171005172013.3098-3-ehabkost@redhat.com>
Reviewed-by: Lukáš Doktor <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qemu.py | 3 +--
scripts/qmp/qmp.py | 16 +++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index c9a106fbce..f6d2e68627 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -177,8 +177,7 @@ class QEMUMachine(object):
def _pre_launch(self):
self._qmp = qmp.qmp.QEMUMonitorProtocol(self._monitor_address,
- server=True,
- debug=self._debug)
+ server=True)
def _post_launch(self):
self._qmp.accept()
diff --git a/scripts/qmp/qmp.py b/scripts/qmp/qmp.py
index ef12e8a1a0..07c9632e9e 100644
--- a/scripts/qmp/qmp.py
+++ b/scripts/qmp/qmp.py
@@ -11,7 +11,7 @@
import json
import errno
import socket
-import sys
+import logging
class QMPError(Exception):
@@ -32,12 +32,14 @@ class QMPTimeoutError(QMPError):
class QEMUMonitorProtocol(object):
+ #: Logger object for debugging messages
+ logger = logging.getLogger('QMP')
#: Socket's error class
error = socket.error
#: Socket's timeout
timeout = socket.timeout
- def __init__(self, address, server=False, debug=False):
+ def __init__(self, address, server=False):
"""
Create a QEMUMonitorProtocol class.
@@ -51,7 +53,6 @@ class QEMUMonitorProtocol(object):
"""
self.__events = []
self.__address = address
- self._debug = debug
self.__sock = self.__get_sock()
self.__sockfile = None
if server:
@@ -83,8 +84,7 @@ class QEMUMonitorProtocol(object):
return
resp = json.loads(data)
if 'event' in resp:
- if self._debug:
- print >>sys.stderr, "QMP:<<< %s" % resp
+ self.logger.debug("<<< %s", resp)
self.__events.append(resp)
if not only_event:
continue
@@ -164,8 +164,7 @@ class QEMUMonitorProtocol(object):
@return QMP response as a Python dict or None if the connection has
been closed
"""
- if self._debug:
- print >>sys.stderr, "QMP:>>> %s" % qmp_cmd
+ self.logger.debug(">>> %s", qmp_cmd)
try:
self.__sock.sendall(json.dumps(qmp_cmd))
except socket.error as err:
@@ -173,8 +172,7 @@ class QEMUMonitorProtocol(object):
return
raise socket.error(err)
resp = self.__json_read()
- if self._debug:
- print >>sys.stderr, "QMP:<<< %s" % resp
+ self.logger.debug("<<< %s", resp)
return resp
def cmd(self, name, args=None, cmd_id=None):
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Qemu-devel] [PULL 5/5] scripts: Remove debug parameter from QEMUMachine
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
` (3 preceding siblings ...)
2017-10-11 18:51 ` [Qemu-devel] [PULL 4/5] scripts: Remove debug parameter from QEMUMonitorProtocol Eduardo Habkost
@ 2017-10-11 18:51 ` Eduardo Habkost
2017-10-12 10:04 ` [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Eduardo Habkost @ 2017-10-11 18:51 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Cleber Rosa
All scripts that use the QEMUMachine and QEMUQtestMachine classes
(device-crash-test, tests/migration/*, iotests.py, basevm.py)
already configure logging.
The basicConfig() call inside QEMUMachine.__init__() is being
kept just to make sure a script would still work if it didn't
configure logging.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20171005172013.3098-4-ehabkost@redhat.com>
Reviewed-by: Lukáš Doktor <ldoktor@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qemu.py | 6 ++----
tests/migration/guestperf/engine.py | 6 ++----
tests/qemu-iotests/iotests.py | 2 --
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index f6d2e68627..9bfdf6d37d 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -54,7 +54,7 @@ class QEMUMachine(object):
def __init__(self, binary, args=None, wrapper=None, name=None,
test_dir="/var/tmp", monitor_address=None,
- socket_scm_helper=None, debug=False):
+ socket_scm_helper=None):
'''
Initialize a QEMUMachine
@@ -65,7 +65,6 @@ class QEMUMachine(object):
@param test_dir: where to create socket and log file
@param monitor_address: address for QMP monitor
@param socket_scm_helper: helper program, required for send_fd_scm()"
- @param debug: enable debug mode
@note: Qemu process is not started until launch() is used.
'''
if args is None:
@@ -85,12 +84,11 @@ class QEMUMachine(object):
self._events = []
self._iolog = None
self._socket_scm_helper = socket_scm_helper
- self._debug = debug
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))
+ logging.basicConfig()
def __enter__(self):
return self
diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py
index 0a13050bc6..e14d4320b2 100644
--- a/tests/migration/guestperf/engine.py
+++ b/tests/migration/guestperf/engine.py
@@ -388,15 +388,13 @@ class Engine(object):
args=self._get_src_args(hardware),
wrapper=self._get_src_wrapper(hardware),
name="qemu-src-%d" % os.getpid(),
- monitor_address=srcmonaddr,
- debug=self._debug)
+ monitor_address=srcmonaddr)
dst = qemu.QEMUMachine(self._binary,
args=self._get_dst_args(hardware, uri),
wrapper=self._get_dst_wrapper(hardware),
name="qemu-dst-%d" % os.getpid(),
- monitor_address=dstmonaddr,
- debug=self._debug)
+ monitor_address=dstmonaddr)
try:
src.launch()
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 36a7757aaf..6f057904a9 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -195,8 +195,6 @@ class VM(qtest.QEMUQtestMachine):
super(VM, self).__init__(qemu_prog, qemu_opts, name=name,
test_dir=test_dir,
socket_scm_helper=socket_scm_helper)
- if debug:
- self._debug = True
self._num_drives = 0
def add_device(self, opts):
--
2.13.6
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11
2017-10-11 18:50 [Qemu-devel] [PULL 0/5] Python queue, 2017-10-11 Eduardo Habkost
` (4 preceding siblings ...)
2017-10-11 18:51 ` [Qemu-devel] [PULL 5/5] scripts: Remove debug parameter from QEMUMachine Eduardo Habkost
@ 2017-10-12 10:04 ` Peter Maydell
5 siblings, 0 replies; 7+ messages in thread
From: Peter Maydell @ 2017-10-12 10:04 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers, Cleber Rosa
On 11 October 2017 at 19:50, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit bac960832015bf4c4c1b873011612e2675e4464c:
>
> Merge remote-tracking branch 'remotes/elmarco/tags/vus-pull-request' into staging (2017-10-11 13:10:36 +0100)
>
> are available in the git repository at:
>
> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>
> for you to fetch changes up to 1a6d3757107181dc0b9baf3dd8ff40fb2a242b66:
>
> scripts: Remove debug parameter from QEMUMachine (2017-10-11 15:15:17 -0300)
>
> ----------------------------------------------------------------
> Python queue, 2017-10-11
>
> ----------------------------------------------------------------
>
> Eduardo Habkost (5):
> iotests: Set up Python logging
> basevm: Call logging.basicConfig()
> guestperf: Configure logging on all shell frontends
> scripts: Remove debug parameter from QEMUMonitorProtocol
> scripts: Remove debug parameter from QEMUMachine
>
> scripts/qemu.py | 9 +++------
> scripts/qmp/qmp.py | 16 +++++++---------
> tests/migration/guestperf/engine.py | 6 ++----
> tests/migration/guestperf/shell.py | 13 +++++++++++++
> tests/qemu-iotests/iotests.py | 5 +++--
> tests/vm/basevm.py | 4 ++--
> 6 files changed, 30 insertions(+), 23 deletions(-)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 7+ messages in thread