@@ -157,10 +157,13 @@ def event_match(event, match=None):
class VM(object):
'''A QEMU VM'''
- def __init__(self):
- self._monitor_path = os.path.join(test_dir, 'qemu-mon.%d' % os.getpid())
- self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d' % os.getpid())
- self._qtest_path = os.path.join(test_dir, 'qemu-qtest.%d' % os.getpid())
+ def __init__(self, path_suffix=''):
+ self._monitor_path = os.path.join(test_dir, 'qemu-mon%s.%d' %
+ (path_suffix, os.getpid()))
+ self._qemu_log_path = os.path.join(test_dir, 'qemu-log%s.%d' %
+ (path_suffix, os.getpid()))
+ self._qtest_path = os.path.join(test_dir, 'qemu-qtest%s.%d' %
+ (path_suffix, os.getpid()))
self._args = qemu_args + ['-chardev',
'socket,id=mon,path=' + self._monitor_path,
'-mon', 'chardev=mon,mode=control',
By adding an optional suffix to the files used for communication with a VM, we can launch multiple VM instances concurrently. Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/iotests.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)