The only problem with it is the same qmp socket name (which is
vm._monitor_path) for all vms. And because of this second vm couldn't be
lauched (vm.launch() fails because of socket is already in use).
This patch adds a number of vm into vm._monitor_path
Reviewed-by: John Snow <js...@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@parallels.com>
---
tests/qemu-iotests/iotests.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e93e623..0579849 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -97,11 +97,12 @@ def event_match(event, match=None):
class VM(object):
'''A QEMU VM'''
+ nb_vms = 0
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())
+ self._monitor_path = os.path.join(test_dir, 'qemu-mon.%d.%d' %
(os.getpid(), VM.nb_vms))
+ self._qemu_log_path = os.path.join(test_dir, 'qemu-log.%d.%d' %
(os.getpid(), VM.nb_vms))
+ self._qtest_path = os.path.join(test_dir, 'qemu-qtest.%d.%d' %
(os.getpid(), VM.nb_vms))
self._args = qemu_args + ['-chardev',
'socket,id=mon,path=' + self._monitor_path,
'-mon', 'chardev=mon,mode=control',
@@ -110,6 +111,7 @@ class VM(object):
'-display', 'none', '-vga', 'none']
self._num_drives = 0
self._events = []
+ VM.nb_vms += 1
# This can be used to add an unused monitor instance.
def add_monitor_telnet(self, ip, port):
--
1.9.1
