From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:39962) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gorkL-00078p-7d for qemu-devel@nongnu.org; Wed, 30 Jan 2019 10:25:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gorkK-0005c8-EO for qemu-devel@nongnu.org; Wed, 30 Jan 2019 10:25:49 -0500 From: Max Reitz Date: Wed, 30 Jan 2019 16:24:33 +0100 Message-Id: <20190130152434.17283-10-mreitz@redhat.com> In-Reply-To: <20190130152434.17283-1-mreitz@redhat.com> References: <20190130152434.17283-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 09/10] iotests: Let 045 be run concurrently List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf , John Snow Adding a telnet monitor for no real purpose on a fixed port is not so great. Just use a null monitor instead. Signed-off-by: Max Reitz --- scripts/qemu.py | 5 ++--- tests/qemu-iotests/045 | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 0a5e02eb56..e642a55816 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -136,10 +136,9 @@ class QEMUMachine(object): return False =20 # This can be used to add an unused monitor instance. - def add_monitor_telnet(self, ip, port): - args =3D 'tcp:%s:%d,server,nowait,telnet' % (ip, port) + def add_monitor_null(self): self._args.append('-monitor') - self._args.append(args) + self._args.append('null') =20 def add_fd(self, fd, fdset, opaque, opts=3D''): """ diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045 index 55a5d31ca8..d5484a0ee1 100755 --- a/tests/qemu-iotests/045 +++ b/tests/qemu-iotests/045 @@ -132,7 +132,7 @@ class TestSCMFd(iotests.QMPTestCase): qemu_img('create', '-f', iotests.imgfmt, image0, '128K') # Add an unused monitor, to verify it works fine when two monito= r # instances present - self.vm.add_monitor_telnet("0",4445) + self.vm.add_monitor_null() self.vm.launch() =20 def tearDown(self): --=20 2.20.1