From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7X-0007ve-Sl for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsZ7X-0005pd-20 for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:55 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40668 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsZ7W-0005oK-JM for qemu-devel@nongnu.org; Wed, 13 May 2015 12:02:54 -0400 From: Vladimir Sementsov-Ogievskiy Date: Wed, 13 May 2015 18:30:03 +0300 Message-Id: <1431531007-10269-9-git-send-email-vsementsov@parallels.com> In-Reply-To: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> References: <1431531007-10269-1-git-send-email-vsementsov@parallels.com> Subject: [Qemu-devel] [PATCH 08/12] iotests: maintain several vms in test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, quintela@redhat.com, dgilbert@redhat.com, vsementsov@parallels.com, stefanha@redhat.com, den@openvz.org, amit.shah@redhat.com, pbonzini@redhat.com, jsnow@redhat.com 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 Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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