[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC v4 08/13] iotests: maintain several vms in test
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH RFC v4 08/13] iotests: maintain several vms in test |
Date: |
Fri, 27 Feb 2015 20:24:46 +0300 |
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 <address@hidden>
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
tests/qemu-iotests/iotests.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index cf5faac..fa756b4 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -77,16 +77,18 @@ def create_image(name, size):
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._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._args = qemu_args + ['-chardev',
'socket,id=mon,path=' + self._monitor_path,
'-mon', 'chardev=mon,mode=control',
'-qtest', 'stdio', '-machine', 'accel=qtest',
'-display', 'none', '-vga', 'none']
self._num_drives = 0
+ VM.nb_vms += 1
# This can be used to add an unused monitor instance.
def add_monitor_telnet(self, ip, port):
--
1.9.1
- [Qemu-devel] [PATCH RFC v4 09/13] iotests: add add_incoming_migration to VM class, (continued)
- [Qemu-devel] [PATCH RFC v4 09/13] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 03/13] block: tiny refactoring: minimize hbitmap_(set/reset) usage, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 05/13] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 06/13] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 11/13] qapi: add md5 checksum of last dirty bitmap level to query-block, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 02/13] block: BdrvDirtyBitmap serialization interface, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 12/13] iotests: add dirty bitmap migration test, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 08/13] iotests: maintain several vms in test,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH RFC v4 13/13] migration/qemu-file: make functions qemu_(get/put)_string public, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 04/13] block: add meta bitmaps, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 01/13] hbitmap: serialization, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 10/13] iotests: add event_wait to VM class, Vladimir Sementsov-Ogievskiy, 2015/02/27
- [Qemu-devel] [PATCH RFC v4 07/13] migration: add migration/block-dirty-bitmap.c, Vladimir Sementsov-Ogievskiy, 2015/02/27
- Re: [Qemu-devel] [PATCH RFC v4 00/13] Dirty bitmaps migration, John Snow, 2015/02/27