From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZbZz-00012h-80 for qemu-devel@nongnu.org; Tue, 16 Aug 2016 06:26:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZbZx-0006PR-88 for qemu-devel@nongnu.org; Tue, 16 Aug 2016 06:26:42 -0400 From: Vladimir Sementsov-Ogievskiy Date: Tue, 16 Aug 2016 13:26:10 +0300 Message-Id: <1471343175-14945-14-git-send-email-vsementsov@virtuozzo.com> In-Reply-To: <1471343175-14945-1-git-send-email-vsementsov@virtuozzo.com> References: <1471343175-14945-1-git-send-email-vsementsov@virtuozzo.com> Subject: [Qemu-devel] [PATCH 13/18] iotests: maintain several vms in test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-block@nongnu.org Cc: pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, famz@redhat.com, stefanha@redhat.com, amit.shah@redhat.com, quintela@redhat.com, mreitz@redhat.com, kwolf@redhat.com, peter.maydell@linaro.org, dgilbert@redhat.com, den@openvz.org, jsnow@redhat.com, vsementsov@virtuozzo.com, lirans@il.ibm.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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index dbe0ee5..fade81e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -130,11 +130,14 @@ def log(msg, filters=[]): class VM(qtest.QEMUQtestMachine): '''A QEMU VM''' + nb_vms = 0 def __init__(self): - super(VM, self).__init__(qemu_prog, qemu_opts, test_dir=test_dir, + super(VM, self).__init__(qemu_prog, qemu_opts, + name = 'vm-%d' % VM.nb_vms, test_dir=test_dir, socket_scm_helper=socket_scm_helper) self._num_drives = 0 + VM.nb_vms += 1 def add_drive_raw(self, opts): self._args.append('-drive') -- 1.8.3.1