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>
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
@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:
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
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()
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):