From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721438; cv=none; d=zoho.com; s=zohoarc; b=DGKONbnqgI+1y2QtyYWN7LFM1Kf2SrLc9YSMFUctgH9kFwlLWPwlS/gOrXXhF9sw4ArOsNvyTKzyfyVG2n5Z/lS18I5wQDBQQf5o9r6ye2svJM30RHNjCUV6yuipjpqo7hAJOIYdKMcD70YXX7eqR1k3rsyCpwlKeKxP9jGwlaI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721438; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CVHgpo241ZFvFTNfiOx0beoOeWdOrhQbMrUp1RXw+kw=; b=jVz3uz/5vhAfCPr2AWJoIcR0S16IbboL48vDQ2AJ1Jvh6WqHdN4aUnqTInb9vDBehF5T2VRPpS8Ytzc6slqKMFiZPXaGlZBcGeMra5Q9OL2Fv2bt8xooIqs9XolRjvB4Al7MzMhexuCIA83ZbQMMz8EB+Luz5FnXTAvZo7OD1Ek= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721438263705.4703794302008; Thu, 10 Oct 2019 08:30:38 -0700 (PDT) Received: from localhost ([::1]:41138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaOi-00037T-M2 for importer@patchew.org; Thu, 10 Oct 2019 11:30:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60449) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJR-0005kw-4J for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJQ-0004Gu-0V for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55516) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJM-0004Fu-9d; Thu, 10 Oct 2019 11:25:04 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 72035801661; Thu, 10 Oct 2019 15:25:03 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6286196B2; Thu, 10 Oct 2019 15:25:02 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 01/23] iotests: Introduce $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:35 +0200 Message-Id: <20191010152457.17713-2-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Thu, 10 Oct 2019 15:25:03 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Unix sockets generally have a maximum path length. Depending on your $TEST_DIR, it may be exceeded and then all tests that create and use Unix sockets there may fail. Circumvent this by adding a new scratch directory specifically for Unix socket files. It defaults to a temporary directory (mktemp -d) that is completely removed after the iotests are done. (By default, mktemp -d creates a /tmp/tmp.XXXXXXXXXX directory, which should be short enough for our use cases.) Signed-off-by: Max Reitz --- tests/qemu-iotests/check | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 588c453a94..a257215448 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -97,6 +97,7 @@ IMGFMT -- $FULL_IMGFMT_DETAILS IMGPROTO -- $IMGPROTO PLATFORM -- $FULL_HOST_DETAILS TEST_DIR -- $TEST_DIR +SOCK_DIR -- $SOCK_DIR SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER =20 EOF @@ -121,6 +122,16 @@ if [ ! -e "$TEST_DIR" ]; then mkdir "$TEST_DIR" fi =20 +tmp_sock_dir=3Dfalse +if [ -z "$SOCK_DIR" ]; then + SOCK_DIR=3D$(mktemp -d) + tmp_sock_dir=3Dtrue +fi + +if [ ! -d "$SOCK_DIR" ]; then + mkdir "$SOCK_DIR" +fi + diff=3D"diff -u" verbose=3Dfalse debug=3Dfalse @@ -534,6 +545,7 @@ if [ -z "$SAMPLE_IMG_DIR" ]; then fi =20 export TEST_DIR +export SOCK_DIR export SAMPLE_IMG_DIR =20 if [ -s $tmp.list ] @@ -716,6 +728,11 @@ END { if (NR > 0) { rm -f "${TEST_DIR}"/*.out "${TEST_DIR}"/*.err "${TEST_DIR}"/*.time rm -f "${TEST_DIR}"/check.pid "${TEST_DIR}"/check.sts rm -f $tmp.* + + if $tmp_sock_dir + then + rm -rf "$SOCK_DIR" + fi } =20 trap "_wrapup; exit \$status" 0 1 2 3 15 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721265; cv=none; d=zoho.com; s=zohoarc; b=dUmKz/nnyr7MgOSg7TfoFwmkhxpZab73B0wesIExKLy8f7BDIyk3JHopWCil9vgP8dp597oW4N8hRp636VLyMwtp+zSGSH8gvTX6XMFFqkBXqsoqa6Ib5eBS6zHZM+wBtxlxYuzLL6IjkJm2ev7X685M11EEDYC8/sRMx2l1b7Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721265; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Al5gjY8F9UlYfBicxtxzGtH0d0dEwHuhFY6RmnOs17c=; b=Ilzs1wmS+YZM1xAmskc08WnrvlF2Zvo0CbbFHI2n5o2rwFI1rWkTnNpPYcEtTsMnXrHtlEIewLKPcUvj/2exppE5GRyV+L4GM58BHLkKsR9a9PFrf0XVUAUPrYsP05Xoc5NHSrcpvTip782Sz2lZwNSG6z+vhoc2Evk77uWtZLI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721265210639.1310684508206; Thu, 10 Oct 2019 08:27:45 -0700 (PDT) Received: from localhost ([::1]:41110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaLr-0007yh-3E for importer@patchew.org; Thu, 10 Oct 2019 11:27:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJV-0005mB-S6 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJT-0004JX-VC for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46070) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJQ-0004Ge-06; Thu, 10 Oct 2019 11:25:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F2033086E22; Thu, 10 Oct 2019 15:25:06 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4F7160BE1; Thu, 10 Oct 2019 15:25:05 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 02/23] iotests.py: Store socket files in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:36 +0200 Message-Id: <20191010152457.17713-3-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 10 Oct 2019 15:25:06 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" iotests.py itself does not store socket files, but it machine.py and qtest.py do. iotests.py needs to pass the respective path to them, and they need to adhere to it. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- python/qemu/machine.py | 15 ++++++++++++--- python/qemu/qtest.py | 9 ++++++--- tests/qemu-iotests/iotests.py | 4 +++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 128a3d1dc2..2024e8b1b1 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -71,7 +71,7 @@ class QEMUMachine(object): =20 def __init__(self, binary, args=3DNone, wrapper=3DNone, name=3DNone, test_dir=3D"/var/tmp", monitor_address=3DNone, - socket_scm_helper=3DNone): + socket_scm_helper=3DNone, sock_dir=3DNone): ''' Initialize a QEMUMachine =20 @@ -90,6 +90,8 @@ class QEMUMachine(object): wrapper =3D [] if name is None: name =3D "qemu-%d" % os.getpid() + if sock_dir is None: + sock_dir =3D test_dir self._name =3D name self._monitor_address =3D monitor_address self._vm_monitor =3D None @@ -106,12 +108,14 @@ class QEMUMachine(object): self._qemu_full_args =3D None self._test_dir =3D test_dir self._temp_dir =3D None + self._sock_dir =3D sock_dir self._launched =3D False self._machine =3D None self._console_set =3D False self._console_device_type =3D None self._console_address =3D None self._console_socket =3D None + self._remove_files =3D [] =20 # just in case logging wasn't configured by the main script: logging.basicConfig() @@ -236,8 +240,9 @@ class QEMUMachine(object): if self._machine is not None: args.extend(['-machine', self._machine]) if self._console_set: - self._console_address =3D os.path.join(self._temp_dir, + self._console_address =3D os.path.join(self._sock_dir, self._name + "-console.so= ck") + self._remove_files.append(self._console_address) chardev =3D ('socket,id=3Dconsole,path=3D%s,server,nowait' % self._console_address) args.extend(['-chardev', chardev]) @@ -253,8 +258,9 @@ class QEMUMachine(object): if self._monitor_address is not None: self._vm_monitor =3D self._monitor_address else: - self._vm_monitor =3D os.path.join(self._temp_dir, + self._vm_monitor =3D os.path.join(self._sock_dir, self._name + "-monitor.sock") + self._remove_files.append(self._vm_monitor) self._qemu_log_path =3D os.path.join(self._temp_dir, self._name + = ".log") self._qemu_log_file =3D open(self._qemu_log_path, 'wb') =20 @@ -279,6 +285,9 @@ class QEMUMachine(object): shutil.rmtree(self._temp_dir) self._temp_dir =3D None =20 + while len(self._remove_files) > 0: + self._remove_if_exists(self._remove_files.pop()) + def launch(self): """ Launch the VM and make sure we cleanup and expose the diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py index 3f1d2cb325..d24ad04256 100644 --- a/python/qemu/qtest.py +++ b/python/qemu/qtest.py @@ -84,14 +84,17 @@ class QEMUQtestMachine(QEMUMachine): '''A QEMU VM''' =20 def __init__(self, binary, args=3DNone, name=3DNone, test_dir=3D"/var/= tmp", - socket_scm_helper=3DNone): + socket_scm_helper=3DNone, sock_dir=3DNone): if name is None: name =3D "qemu-%d" % os.getpid() + if sock_dir is None: + sock_dir =3D test_dir super(QEMUQtestMachine, self).__init__(binary, args, name=3Dname, test_dir=3Dtest_di= r, - socket_scm_helper=3Dsocket_scm_helper) + socket_scm_helper=3Dsocket_scm_helper, + sock_dir=3Dsock_dir) self._qtest =3D None - self._qtest_path =3D os.path.join(test_dir, name + "-qtest.sock") + self._qtest_path =3D os.path.join(sock_dir, name + "-qtest.sock") =20 def _base_args(self): args =3D super(QEMUQtestMachine, self)._base_args() diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 3a8f378f90..49cd205a97 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -57,6 +57,7 @@ qemu_opts =3D os.environ.get('QEMU_OPTIONS', '').strip().= split(' ') imgfmt =3D os.environ.get('IMGFMT', 'raw') imgproto =3D os.environ.get('IMGPROTO', 'file') test_dir =3D os.environ.get('TEST_DIR') +sock_dir =3D os.environ.get('SOCK_DIR') output_dir =3D os.environ.get('OUTPUT_DIR', '.') cachemode =3D os.environ.get('CACHEMODE') qemu_default_machine =3D os.environ.get('QEMU_DEFAULT_MACHINE') @@ -445,7 +446,8 @@ class VM(qtest.QEMUQtestMachine): name =3D "qemu%s-%d" % (path_suffix, os.getpid()) super(VM, self).__init__(qemu_prog, qemu_opts, name=3Dname, test_dir=3Dtest_dir, - socket_scm_helper=3Dsocket_scm_helper) + socket_scm_helper=3Dsocket_scm_helper, + sock_dir=3Dsock_dir) self._num_drives =3D 0 =20 def add_object(self, opts): --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721445; cv=none; d=zoho.com; s=zohoarc; b=gE1/pBk67w4+J0q30SfEpYwtan5mfB3yyvIT/VY2mD2owOTfI2ZLiLeluxtvDAnBubTz/tZOfQjZ+E5kqYtdXvxoItCooTA6ZlKtfSthgJYFYOh6HCRweuRZ9gK7h7afppVGSakaH6eGJeQejisBd4h23irCV+SKyQnrokYPLq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721445; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BJgq8YnZeggqcjRFpotaXWAu/AQPPBbWA0iZFkh6HKM=; b=KbLZEhzZFXA4DnWw35QAHu9KRz3+GcWz+bVcwvjm1ltq14HRcgyUIRaZPJcZOLt5eiqpGOoaZCr++mlGJ2H1NSaNLIipH6wZKtjWcJqBKfqiEfcHY6e7v+aWDug3rW+aXtSQP428aBEIPrC0iqXiYeljgAz172JIbUmT+Gyzk4o= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721445776759.8371047418441; Thu, 10 Oct 2019 08:30:45 -0700 (PDT) Received: from localhost ([::1]:41146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaOq-0003JA-5w for importer@patchew.org; Thu, 10 Oct 2019 11:30:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJW-0005nz-Re for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJV-0004LV-RH for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39350) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJS-0004HU-8m; Thu, 10 Oct 2019 11:25:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7FB8710C092D; Thu, 10 Oct 2019 15:25:09 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EED661001B11; Thu, 10 Oct 2019 15:25:08 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 03/23] iotests.py: Add @base_dir to FilePaths etc. Date: Thu, 10 Oct 2019 17:24:37 +0200 Message-Id: <20191010152457.17713-4-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Thu, 10 Oct 2019 15:25:09 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Specifying this optional parameter allows creating temporary files in other directories than the test_dir; for example in sock_dir. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/iotests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 49cd205a97..5373149ae1 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -375,10 +375,10 @@ class FilePaths(object): qemu_img('create', img_path, '1G') # migration_sock_path is automatically deleted """ - def __init__(self, names): + def __init__(self, names, base_dir=3Dtest_dir): self.paths =3D [] for name in names: - self.paths.append(os.path.join(test_dir, file_pattern(name))) + self.paths.append(os.path.join(base_dir, file_pattern(name))) =20 def __enter__(self): return self.paths @@ -395,8 +395,8 @@ class FilePath(FilePaths): """ FilePath is a specialization of FilePaths that takes a single filename. """ - def __init__(self, name): - super(FilePath, self).__init__([name]) + def __init__(self, name, base_dir=3Dtest_dir): + super(FilePath, self).__init__([name], base_dir) =20 def __enter__(self): return self.paths[0] @@ -409,7 +409,7 @@ def file_path_remover(): pass =20 =20 -def file_path(*names): +def file_path(*names, base_dir=3Dtest_dir): ''' Another way to get auto-generated filename that cleans itself up. =20 Use is as simple as: @@ -425,7 +425,7 @@ def file_path(*names): paths =3D [] for name in names: filename =3D file_pattern(name) - path =3D os.path.join(test_dir, filename) + path =3D os.path.join(base_dir, filename) file_path_remover.paths.append(path) paths.append(path) =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721811; cv=none; d=zoho.com; s=zohoarc; b=AjFfbcVKyIXcAB+aT5r9TdjXmQG7SUM/1L9Y9k/phgrKHGRkm7jaxf/0dPPpG7hEIbsqqTC+3eAUZiEekWEXNra8OkTPxpgftqWQelWyYyG5h25+E0gEYlEXwu7vRpOF3OLHxug8DmxmsAgabV0jLz5Uv62yNYAg5Yo3TAsp+4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721811; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tYDe2pn1dRTZL2pX9Cn7wjs9doBtSQEGimEeo2UyjbY=; b=ApYmhQMbXIFPk5dKgwd62I1T8OW7cnAN0/rS68e+TgPs3jYLm07tReJqT/JPSF+B99urZq6UEaHuSTAHAvl4jdd/WjUn7/G0zz8PFojUD3WZC40gvOPfH7qerzyyQ81w8W8EIVz87nxe9pgAzi2rfJRKAj3cEeQpk1/iOLi/tvs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721811940174.95216782361933; Thu, 10 Oct 2019 08:36:51 -0700 (PDT) Received: from localhost ([::1]:41216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaUk-0000yU-6W for importer@patchew.org; Thu, 10 Oct 2019 11:36:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60561) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJa-0005sM-Im for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJZ-0004OM-Hf for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39384) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJW-0004Lc-Eg; Thu, 10 Oct 2019 11:25:14 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AC6C410CBC4B; Thu, 10 Oct 2019 15:25:13 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB19810018F8; Thu, 10 Oct 2019 15:25:11 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 04/23] iotests: Filter $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:38 +0200 Message-Id: <20191010152457.17713-5-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Thu, 10 Oct 2019 15:25:13 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/common.filter | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index 9f418b4881..cd42f5e7e3 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -43,7 +43,8 @@ _filter_qom_path() # replace occurrences of the actual TEST_DIR value with TEST_DIR _filter_testdir() { - $SED -e "s#$TEST_DIR/#TEST_DIR/#g" + $SED -e "s#$TEST_DIR/#TEST_DIR/#g" \ + -e "s#$SOCK_DIR/#SOCK_DIR/#g" } =20 # replace occurrences of the actual IMGFMT value with IMGFMT @@ -124,6 +125,7 @@ _filter_img_create() $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ + -e "s#$SOCK_DIR#SOCK_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ -e 's#nbd:127.0.0.1:10810#TEST_DIR/t.IMGFMT#g' \ -e "s# encryption=3Doff##g" \ @@ -160,6 +162,7 @@ _filter_img_info() $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ + -e "s#$SOCK_DIR#SOCK_DIR#g" \ -e "s#$IMGFMT#IMGFMT#g" \ -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \ -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \ @@ -218,7 +221,8 @@ _filter_nbd() # Filter out the TCP port number since this changes between runs. $SED -e '/nbd\/.*\.c:/d' \ -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ - -e "s#?socket=3D$TEST_DIR#?socket=3DTEST_DIR#g" \ + -e "s#?socket=3D$SOCK_DIR#?socket=3DTEST_DIR#g" \ + -e "s#?socket=3D$SOCK_DIR#?socket=3DSOCK_DIR#g" \ -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721771; cv=none; d=zoho.com; s=zohoarc; b=JRryHIEd7+80odFB/27UT7E1up0TCiaHGyvXDl9tOFYoQUiBXPh61RB6N7Uzf/zgEmzciAbylC2Amy6j5ZZSmmmtIyt20qG3pgzE9MajGtoFBchIx8b78CqMWJq3LokJhVu14dSyxjEY0ik2MCs5Ji/PlvgnkuqEx6O+WaXwuUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721771; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qt7VcFkrnklumnx81Iowtp9j/N211iSp/is+XyUOQpI=; b=GXPLVQ5NFwM58fqSW2a1awHrxp8THrV3KbGjR8KKIf9rKnx2VsB/ajRrgcB4geUdwStHB6ommI3k5tFQpgWZk7XFRLP6xq6EVnUcSa7p+g+56ijpV6eDRy71qfB9qYhxCV2By1haPw+MSNs6ARzq68zuI3PPpLFzdh7VQ4Qo4NE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721771607671.9693683342084; Thu, 10 Oct 2019 08:36:11 -0700 (PDT) Received: from localhost ([::1]:41198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaU5-0008V6-U3 for importer@patchew.org; Thu, 10 Oct 2019 11:36:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60630) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJj-0005vr-N2 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJi-0004Qw-Hh for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35858) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJZ-0004O3-CF; Thu, 10 Oct 2019 11:25:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96F6F8D5D81; Thu, 10 Oct 2019 15:25:16 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C5EA60BE1; Thu, 10 Oct 2019 15:25:15 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 05/23] iotests: Let common.nbd create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:39 +0200 Message-Id: <20191010152457.17713-6-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Thu, 10 Oct 2019 15:25:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In addition, drop the nbd_unix_socket assignment in 241 because it does not really do anything. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/241 | 2 -- tests/qemu-iotests/common.nbd | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241 index 58b64ebf41..8dae8d39e4 100755 --- a/tests/qemu-iotests/241 +++ b/tests/qemu-iotests/241 @@ -23,8 +23,6 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 -nbd_unix_socket=3D$TEST_DIR/test_qemu_nbd_socket - _cleanup() { _cleanup_test_img diff --git a/tests/qemu-iotests/common.nbd b/tests/qemu-iotests/common.nbd index 24b01b60aa..a8cae8fe2c 100644 --- a/tests/qemu-iotests/common.nbd +++ b/tests/qemu-iotests/common.nbd @@ -19,7 +19,7 @@ # along with this program. If not, see . # =20 -nbd_unix_socket=3D"${TEST_DIR}/qemu-nbd.sock" +nbd_unix_socket=3D"${SOCK_DIR}/qemu-nbd.sock" nbd_tcp_addr=3D"127.0.0.1" nbd_pid_file=3D"${TEST_DIR}/qemu-nbd.pid" nbd_stderr_fifo=3D"${TEST_DIR}/qemu-nbd.fifo" --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721965; cv=none; d=zoho.com; s=zohoarc; b=XA18kdiqpbhzQwpzhAq5LY/v4bfGeHf0l8iuGD6fTF/li1e+UNoCcMU03pw2qjDvQMKrIfh4ZKEZVSW75/Gy08ogj4R0D/6AweiCem/vXUIdQ+XRKfb0Hd+IMXIINa1oRbklbuvRonSauEVt/TzCul+YoVW6kR1keBt2aBxjDC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721965; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=82g9bdtNcKYwKUWdHIzzzDx5rR1qsVNhyTERx1jmpbI=; b=Nkl1g2xEZ3lCivejx+vhiK4DfztS/q2fX0DzmuGbMf9ymWlIkrCSs7ytmJxI9XzZNmLDph2UZZn19Kjf7+o+aAorheX61RABIpfPy/qGs6H5f3W7rMb7+ryKrwFRrrN52g+Q5v6vBr5Lh8y2met7k1yEMdujv7cqBZloeTRdtMc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721965129225.74749773571807; Thu, 10 Oct 2019 08:39:25 -0700 (PDT) Received: from localhost ([::1]:41248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaXD-0003s8-Gp for importer@patchew.org; Thu, 10 Oct 2019 11:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60625) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJj-0005vo-Ci for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJg-0004Q7-Cm for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40040) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJc-0004P0-9V; Thu, 10 Oct 2019 11:25:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81BEB315C03D; Thu, 10 Oct 2019 15:25:19 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9447194B6; Thu, 10 Oct 2019 15:25:18 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 06/23] iotests/083: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:40 +0200 Message-Id: <20191010152457.17713-7-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 10 Oct 2019 15:25:19 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/083 | 6 +++--- tests/qemu-iotests/083.out | 34 +++++++++++++++++----------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index b270550d3e..10fdfc8ebb 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -28,7 +28,7 @@ status=3D1 # failure is the default! =20 _cleanup() { - rm -f nbd.sock + rm -f "$SOCK_DIR/nbd.sock" rm -f nbd-fault-injector.out rm -f nbd-fault-injector.conf } @@ -80,10 +80,10 @@ EOF if [ "$proto" =3D "tcp" ]; then nbd_addr=3D"127.0.0.1:0" else - nbd_addr=3D"$TEST_DIR/nbd.sock" + nbd_addr=3D"$SOCK_DIR/nbd.sock" fi =20 - rm -f "$TEST_DIR/nbd.sock" + rm -f "$SOCK_DIR/nbd.sock" =20 echo > "$TEST_DIR/nbd-fault-injector.out" $PYTHON nbd-fault-injector.py $extra_args "$nbd_addr" "$TEST_DIR/nbd-faul= t-injector.conf" >"$TEST_DIR/nbd-fault-injector.out" 2>&1 & diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out index eee6dd1379..2090ee693c 100644 --- a/tests/qemu-iotests/083.out +++ b/tests/qemu-iotests/083.out @@ -110,43 +110,43 @@ read failed: Input/output error =20 =3D=3D=3D Check disconnect before neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 8 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 neg1 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 4 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 12 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 export =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg2 =3D=3D=3D =20 @@ -154,11 +154,11 @@ read failed: Input/output error =20 =3D=3D=3D Check disconnect 8 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 10 neg2 =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///foo?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///foo?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect before request =3D=3D=3D =20 @@ -195,23 +195,23 @@ read 512/512 bytes at offset 0 =20 =3D=3D=3D Check disconnect before neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 8 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 16 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 24 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect 28 neg-classic =3D=3D=3D =20 -qemu-io: can't open device nbd+unix:///?socket=3DTEST_DIR/nbd.sock +qemu-io: can't open device nbd+unix:///?socket=3DSOCK_DIR/nbd.sock =20 =3D=3D=3D Check disconnect after neg-classic =3D=3D=3D =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721301; cv=none; d=zoho.com; s=zohoarc; b=XtzlNmCa5W2MvlH/pd+O3AviGPXjmhS2Pa5wSJsWA3FChr/ibgAxVMU2xpkWpZKgHizuT9nyTkuHs7gqEi6Zj6tIRM+Cqi0jWF6zulo7CKFBfvzJtzFxuOnvcjehqBgGKvUzWVg6445/Xr7t0ZGzOpP7O1IcMVzm6Z3MD/Jhf0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721301; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2qCYzZdHCd05LVRofPQTqmCmRtQWYBP9PTIoflNo8WE=; b=a/omu9TXpASBr5E3VR/4HlgAUw+BEMraUTqDkARF9TwO3KXHcgv8UKVjl0kuOZqNMMhkyJ8py5KMGVdZGWAXNTqPOZOmNCZ+JcyHDYPeis3h1xPP+MNK7vgOSekSzkwcbBrSkMOYXlpLIU6lZQjUYTTbNJ+DjZztkkUq9ces764= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721301676127.73205124062758; Thu, 10 Oct 2019 08:28:21 -0700 (PDT) Received: from localhost ([::1]:41114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaMV-0000JS-Ve for importer@patchew.org; Thu, 10 Oct 2019 11:28:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60659) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJl-0005xv-CC for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJk-0004T3-80 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56622) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJg-0004Pt-BW; Thu, 10 Oct 2019 11:25:24 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 96D60970F1; Thu, 10 Oct 2019 15:25:22 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 121BD5C1B5; Thu, 10 Oct 2019 15:25:21 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 07/23] iotests/140: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:41 +0200 Message-Id: <20191010152457.17713-8-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 10 Oct 2019 15:25:22 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/140 | 8 ++++---- tests/qemu-iotests/140.out | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 index b965b1dd5d..8d2ce5d9e3 100755 --- a/tests/qemu-iotests/140 +++ b/tests/qemu-iotests/140 @@ -34,7 +34,7 @@ _cleanup() { _cleanup_qemu _cleanup_test_img - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -69,7 +69,7 @@ _send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \ "{ 'execute': 'nbd-server-start', 'arguments': { 'addr': { 'type': 'unix', - 'data': { 'path': '$TEST_DIR/nbd' }}}}" \ + 'data': { 'path': '$SOCK_DIR/nbd' }}}}" \ 'return' =20 _send_qemu_cmd $QEMU_HANDLE \ @@ -78,7 +78,7 @@ _send_qemu_cmd $QEMU_HANDLE \ 'return' =20 $QEMU_IO_PROG -f raw -r -c 'read -P 42 0 64k' \ - "nbd+unix:///drv?socket=3D$TEST_DIR/nbd" 2>&1 \ + "nbd+unix:///drv?socket=3D$SOCK_DIR/nbd" 2>&1 \ | _filter_qemu_io | _filter_nbd =20 _send_qemu_cmd $QEMU_HANDLE \ @@ -87,7 +87,7 @@ _send_qemu_cmd $QEMU_HANDLE \ 'return' =20 $QEMU_IO_PROG -f raw -r -c close \ - "nbd+unix:///drv?socket=3D$TEST_DIR/nbd" 2>&1 \ + "nbd+unix:///drv?socket=3D$SOCK_DIR/nbd" 2>&1 \ | _filter_qemu_io | _filter_nbd =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out index 67fe44a3e3..2511eb7369 100644 --- a/tests/qemu-iotests/140.out +++ b/tests/qemu-iotests/140.out @@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0 read 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) {"return": {}} -qemu-io: can't open device nbd+unix:///drv?socket=3DTEST_DIR/nbd: Requeste= d export not available +qemu-io: can't open device nbd+unix:///drv?socket=3DSOCK_DIR/nbd: Requeste= d export not available server reported: export 'drv' not present {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721541; cv=none; d=zoho.com; s=zohoarc; b=g5WC4Q4eRRcs/IwnFX5E6TOSp+Jk4GUwfCBnqVCAMhatVYYbyjj9xX4xeL6uxlVZSCV1InsMoRmTxB5UzFUNfazwl/KGPjizbPPr27FgrNAuDqXKP3GLbc4+CKWwfBxN4/kbqVX4a89HjCP/inhgJq+YQcrpVAw01J4NqgZfSMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721541; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IWCJZD75N3u+iakjPLU2iQdtAJLUsc+Br6BISRfx5Y8=; b=iVBzDlWpFNDURqy4U4FPks7RpFnlHzB6i99CE8Q7l59tdBfkhUC9vNn+gnb3t/Cz5bYuEoVSaNihe58dqXr739i8xOWJM6Uw7Wyim+BfnZ10bMqStRt8t53F1+PFFT/dGshdXyfS1xIXGLiYlh9KPh1JirNASH5BqZD6hiKfCz8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721541132927.2855062672829; Thu, 10 Oct 2019 08:32:21 -0700 (PDT) Received: from localhost ([::1]:41148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaQN-00043M-RZ for importer@patchew.org; Thu, 10 Oct 2019 11:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60681) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJo-0005zo-3M for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJm-0004Tg-4f for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJi-0004Qc-HW; Thu, 10 Oct 2019 11:25:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0AE210C0946; Thu, 10 Oct 2019 15:25:25 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 186AE3DE5; Thu, 10 Oct 2019 15:25:24 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 08/23] iotests/143: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:42 +0200 Message-Id: <20191010152457.17713-9-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Thu, 10 Oct 2019 15:25:25 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/143 | 6 +++--- tests/qemu-iotests/143.out | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143 index 92249ac8da..f649b36195 100755 --- a/tests/qemu-iotests/143 +++ b/tests/qemu-iotests/143 @@ -29,7 +29,7 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_qemu - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -51,12 +51,12 @@ _send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \ "{ 'execute': 'nbd-server-start', 'arguments': { 'addr': { 'type': 'unix', - 'data': { 'path': '$TEST_DIR/nbd' }}}}" \ + 'data': { 'path': '$SOCK_DIR/nbd' }}}}" \ 'return' =20 # This should just result in a client error, not in the server crashing $QEMU_IO_PROG -f raw -c quit \ - "nbd+unix:///no_such_export?socket=3D$TEST_DIR/nbd" 2>&1 \ + "nbd+unix:///no_such_export?socket=3D$SOCK_DIR/nbd" 2>&1 \ | _filter_qemu_io | _filter_nbd =20 _send_qemu_cmd $QEMU_HANDLE \ diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out index ee71b5aa42..037d34a409 100644 --- a/tests/qemu-iotests/143.out +++ b/tests/qemu-iotests/143.out @@ -1,7 +1,7 @@ QA output created by 143 {"return": {}} {"return": {}} -qemu-io: can't open device nbd+unix:///no_such_export?socket=3DTEST_DIR/nb= d: Requested export not available +qemu-io: can't open device nbd+unix:///no_such_export?socket=3DSOCK_DIR/nb= d: Requested export not available server reported: export 'no_such_export' not present {"return": {}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}} --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722048; cv=none; d=zoho.com; s=zohoarc; b=d4e/EP87Lc585bvc8T6bRm2jBEE1kxSHu/YXcLHL0YAMkMvtoF2b2TQcPKX1NnrrBypa8JoajYs0bYI/EOPAmq5t0EXjSV99SS8ykGwIyKv1OAScQuvSDNBKWyTnZDgn+3/lUyYH2FdUN9f1qL7mT5HKD/bwb1Oqdp+ZVPSY7SM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722048; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xkHaadGiUYvILT5obrgg+ukfHDhT4Dx44Xcs5nfFGpA=; b=T4/NeTo4gAZOwn+aY1odN6KtonpF9CtyZU3nJywI1QolVR/97epJnEc/b/FhP0lbk11jCV64T62HKa+VIDI6Io/FbfwkdbP6nQ7vleSgpHsU13f+Wjp08zwNbkD512OhWZ8Vter+zdxrF6dmRtExNnT/bRsTbE97vaaoJVkeNqQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722048911364.0985918357841; Thu, 10 Oct 2019 08:40:48 -0700 (PDT) Received: from localhost ([::1]:41274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaYZ-0005Kt-Bn for importer@patchew.org; Thu, 10 Oct 2019 11:40:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60707) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJp-00061W-1Z for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJo-0004UG-2a for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJl-0004TC-4O; Thu, 10 Oct 2019 11:25:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 365253084288; Thu, 10 Oct 2019 15:25:28 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBEDA1001B23; Thu, 10 Oct 2019 15:25:27 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 09/23] iotests/147: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:43 +0200 Message-Id: <20191010152457.17713-10-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 10 Oct 2019 15:25:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/147 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index ab8480b9a4..03fc2fabcf 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -32,7 +32,7 @@ NBD_IPV6_PORT_START =3D NBD_PORT_END NBD_IPV6_PORT_END =3D NBD_IPV6_PORT_START + 1024 =20 test_img =3D os.path.join(iotests.test_dir, 'test.img') -unix_socket =3D os.path.join(iotests.test_dir, 'nbd.socket') +unix_socket =3D os.path.join(iotests.sock_dir, 'nbd.socket') =20 =20 def flatten_sock_addr(crumpled_address): --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722348; cv=none; d=zoho.com; s=zohoarc; b=iV0Oo3+kya1QMCrCrcOsSSr2BoPZlBUpqkX8n89sZbObtx5cJKOE3b53lu0HaeuzwKSAdWO6B/NpBzSapxZtY6jiS93kqmxiUl93Qyci/A4Z/qjb6YuY4xTN0GFYwxaICjPobT9/K5mbRBQ1BsxDo52+k//vEef2ITLu1YoLfXs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722348; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ruAe93KwmXH+Fxl/YhsSj3M9sbGamL0sE2D+xm++reY=; b=EqiRiCFEY9q1X/+UfFrKY25AV0t0VwJFE7vBc3uvRasxBMRawKO1r2h2HW3ZclTM48Q3CCp3365V3Kmf/nzVqYVw9EuZDcUJ+MD+n8Vp+/4FeWfwuAm1yAfOehD2C7lHqOOw6IgtAehrpF5B5ifQeR+NCMC1fElYBnc8qJq1u5U= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15707223486891002.4266081324411; Thu, 10 Oct 2019 08:45:48 -0700 (PDT) Received: from localhost ([::1]:41362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIadP-0000ji-61 for importer@patchew.org; Thu, 10 Oct 2019 11:45:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJr-00066Y-8Y for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJq-0004VM-48 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64164) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJo-0004Tx-1u; Thu, 10 Oct 2019 11:25:32 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1EDE330BCBB4; Thu, 10 Oct 2019 15:25:31 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82F0260BF7; Thu, 10 Oct 2019 15:25:30 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 10/23] iotests/181: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:44 +0200 Message-Id: <20191010152457.17713-11-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 10 Oct 2019 15:25:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/181 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181 index e317e63422..378c2899d1 100755 --- a/tests/qemu-iotests/181 +++ b/tests/qemu-iotests/181 @@ -26,7 +26,7 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 -MIG_SOCKET=3D"${TEST_DIR}/migrate" +MIG_SOCKET=3D"${SOCK_DIR}/migrate" =20 _cleanup() { --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721288; cv=none; d=zoho.com; s=zohoarc; b=bWKh1xDoHq4yVeym4E15EsrrxoW72Xe8UdsYWcwDHZ+yfclvZ9S/95Mk4dESiN0SSmRAPKKDJbbStRbfe94qrVCaVV4wzyPFIZNrfDJ9HrcZOLz+DVxxF/oT0Y3kZf0YOKj8fIXmHEAX31zAlNFAwkHoQBdH7GfDhDEk8H3XfMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721288; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aHZJE+3lI2JEeudm1Zl4+9PBa77QUzLm+73iIBsQ7O4=; b=klzDQn+UTromzhi9B9E4fKrcCXrOVaxnquIee18jw4trO/9zAg6DSUdJaWTqP/ZdwTS2qxGjDsvOPCLs9RElxvXfOWRlMA1YbJiDwzT9f5KYzuAZWVNoaZmU/WF3kpbqUBE90FZEJyMrleek6Fs9CDhlGwZh4BAfvKQgHElyrqo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721288754656.4581750666468; Thu, 10 Oct 2019 08:28:08 -0700 (PDT) Received: from localhost ([::1]:41112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaMJ-0008O2-7G for importer@patchew.org; Thu, 10 Oct 2019 11:28:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJv-0006Bu-1N for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJu-0004WK-1u for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60676) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJq-0004VT-Qg; Thu, 10 Oct 2019 11:25:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DD3818C8933; Thu, 10 Oct 2019 15:25:34 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7922060C18; Thu, 10 Oct 2019 15:25:33 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 11/23] iotests/182: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:45 +0200 Message-Id: <20191010152457.17713-12-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Thu, 10 Oct 2019 15:25:34 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/182 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 7f494eb9bb..1ccb850055 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -31,7 +31,7 @@ _cleanup() { _cleanup_test_img rm -f "$TEST_IMG.overlay" - rm -f "$TEST_DIR/nbd.socket" + rm -f "$SOCK_DIR/nbd.socket" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -133,7 +133,7 @@ success_or_failure=3Dy _send_qemu_cmd $QEMU_HANDLE \ 'addr': { 'type': 'unix', 'data': { - 'path': '$TEST_DIR/nbd.socket' + 'path': '$SOCK_DIR/nbd.socket' } } } }" \ 'return' \ 'error' --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722723; cv=none; d=zoho.com; s=zohoarc; b=n6Oy/QA7uChcNun1MWoqQjoCQUC6+3ma7Xb8eI5D38CmxscBZWyZrbFvK3vBIY7zDaFeEBH3JMHM7OCzN2lpfVGhIve69DNzDYbjWh0d0PdWgrxcvxi/N1TJprGBJDl7QqFHjP2qg9MXdn20LkZwauQ7aSoiCWwpAGOxtxvxKwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722723; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L1Uz4AmXhs9nm7CuJusGWTdMQOxxkX0oqTwkZCwp3N0=; b=JvBFGxr55uWFddTFRhO0P0N4IuQ9oqhuquDcsxBccdfdhZZOe70tCUVtRtxFZV+J/efLlH2noOW4rBdZ200HQ/CbYVj86L1WK3aIgim0es+EpXElpT85ySMMVcm2xY7MLvQRGczUjQO+FHP7qH1cBI96h/nbUGUuwxBZZZ4Mwh8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722723273675.6528932953232; Thu, 10 Oct 2019 08:52:03 -0700 (PDT) Received: from localhost ([::1]:41452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIajN-0004ys-BZ for importer@patchew.org; Thu, 10 Oct 2019 11:51:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaJx-0006Fa-BJ for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaJw-0004XN-BA for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40170) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJu-0004WD-6O; Thu, 10 Oct 2019 11:25:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A15030603AD; Thu, 10 Oct 2019 15:25:37 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D8CF60BE1; Thu, 10 Oct 2019 15:25:36 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 12/23] iotests/183: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:46 +0200 Message-Id: <20191010152457.17713-13-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 10 Oct 2019 15:25:37 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- tests/qemu-iotests/183 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 index 04fb344d08..bced83fae0 100755 --- a/tests/qemu-iotests/183 +++ b/tests/qemu-iotests/183 @@ -26,7 +26,7 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 -MIG_SOCKET=3D"${TEST_DIR}/migrate" +MIG_SOCKET=3D"${SOCK_DIR}/migrate" =20 _cleanup() { --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722273; cv=none; d=zoho.com; s=zohoarc; b=hofpUKKHKtnGJiBoeAwfwFofldoDhVuRJqnbaCrn+EEDRNWY4Ls5tZ8xScs7GSih4iqfZw8d+VMIU3yi0jm3Y/bPz1PMcUcFKGnBsGPW2aCeCmBfIUAdSZCliQteGXfl7l4rTePOGslslU2WYrsHirmL4o7f+vYUqmAa4Zlax2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722273; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nOJtagKf7q/Xk9h7UPqs4FdXQKKnZLFiU1xn+ScOpwA=; b=kJULTB1Ut6IuyjrvIPWtPnR1thgT6F2e6EMQ8j4nA6zmI67xXVzRxJcmhTxxNMdC1BF2eu9CYHhdwq59P12376tstTmKxx6Ajb1Qk9SojPjBagh8Rcu2iA94POiAeyND34T77XlUD10p7FLjN51PkWG/huy6ioFTaKgcm1vDACY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722273916262.66840571737475; Thu, 10 Oct 2019 08:44:33 -0700 (PDT) Received: from localhost ([::1]:41360 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIacC-0000HT-OZ for importer@patchew.org; Thu, 10 Oct 2019 11:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60822) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaK2-0006JF-8Y for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaK0-0004ZH-Gu for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58808) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaJx-0004Xo-4Y; Thu, 10 Oct 2019 11:25:41 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F893307D88C; Thu, 10 Oct 2019 15:25:40 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D16A71D3; Thu, 10 Oct 2019 15:25:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 13/23] iotests/192: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:47 +0200 Message-Id: <20191010152457.17713-14-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 10 Oct 2019 15:25:40 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/192 | 4 ++-- tests/qemu-iotests/192.out | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192 index 034432272f..d2ba55dd90 100755 --- a/tests/qemu-iotests/192 +++ b/tests/qemu-iotests/192 @@ -31,7 +31,7 @@ _cleanup() { _cleanup_qemu _cleanup_test_img - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -66,7 +66,7 @@ else QEMU_COMM_TIMEOUT=3D1 fi =20 -_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)" +_send_qemu_cmd $h "nbd_server_start unix:$SOCK_DIR/nbd" "(qemu)" _send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)" _send_qemu_cmd $h "q" "(qemu)" =20 diff --git a/tests/qemu-iotests/192.out b/tests/qemu-iotests/192.out index 1e0be4c4d7..b9429dbe36 100644 --- a/tests/qemu-iotests/192.out +++ b/tests/qemu-iotests/192.out @@ -1,7 +1,7 @@ QA output created by 192 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D67108864 QEMU X.Y.Z monitor - type 'help' for more information -(qemu) nbd_server_start unix:TEST_DIR/nbd +(qemu) nbd_server_start unix:SOCK_DIR/nbd (qemu) nbd_server_add -w drive0 (qemu) q *** done --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722605; cv=none; d=zoho.com; s=zohoarc; b=QBEUEKzNEFd7m/YSaZgHeRHwUyRcBVVCQOceCsP24s9uQLfCQ9UqobyRN0Qf9wxY/4hkUA6ZRIGmAkIwuT8YJpkAlRhlj93zJc5+hesdA1xquPYRTBDHFbLEHte+84CiGH3csPifKZ7Tc0mFUbYMA2b3rIBnkNSbQb1XV1Qv7UU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722605; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I1bevuxwpc+0Uu4rN7Femn85HsH5DdgBsqw5RosUMIg=; b=gkQwpYNo5cMyww5/xQl8MfGxD5zLDggPQr53787/OvJAgi09Zy+Uu8/sXIukJXtFnIlTES6Lmg0WS5kEvVPGVtlR/s4k0sMidNVY1yJR3xTPtKzoYrl5N1wXcayjSkQ5WnzekGUSuSJG9srGPhu72PoZVmBrb6Ix4UJJBWI1ocI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722605701697.1650174947775; Thu, 10 Oct 2019 08:50:05 -0700 (PDT) Received: from localhost ([::1]:41436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIahT-00047M-EE for importer@patchew.org; Thu, 10 Oct 2019 11:49:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60862) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaK6-0006NQ-Q3 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaK5-0004bO-RO for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaK0-0004Z6-Ai; Thu, 10 Oct 2019 11:25:44 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74CB4308C21C; Thu, 10 Oct 2019 15:25:43 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E1C80194B6; Thu, 10 Oct 2019 15:25:42 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 14/23] iotests/194: Create sockets in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:48 +0200 Message-Id: <20191010152457.17713-15-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 10 Oct 2019 15:25:43 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/194 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index d746ab1e21..72e47e8833 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -26,8 +26,8 @@ iotests.verify_platform(['linux']) =20 with iotests.FilePath('source.img') as source_img_path, \ iotests.FilePath('dest.img') as dest_img_path, \ - iotests.FilePath('migration.sock') as migration_sock_path, \ - iotests.FilePath('nbd.sock') as nbd_sock_path, \ + iotests.FilePaths(['migration.sock', 'nbd.sock'], iotests.sock_dir) a= s \ + [migration_sock_path, nbd_sock_path], \ iotests.VM('source') as source_vm, \ iotests.VM('dest') as dest_vm: =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722836; cv=none; d=zoho.com; s=zohoarc; b=opAWasgnkB8Rjn4FDjGUQYmrLNltqzMRd7rqY1+Aemf1PvMSikQBscQTWaoH7+w4PJ8AwF/srPGWljdNP/SCJY3zvL1T7VH3qmmfNSuyF1TU5VnCRzMC3mWUzu1FijwEAnUCCr/xjFW2mZOBazLoB6200jLKgoY/Hd1mvoFIkcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722836; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qbm0xd2bqrzYaRr8rq+znE7u7bx2FMo2UjVkgzKBQpQ=; b=e1LtAPA61tuv4bmAJNyYTBBtBfzjhgFEvweydV5FBOhvNUgD4Uc18OzQkkBDsXYLnFxhANbz2V5OOx3OLqkFL04ZXxA2Pnsvzb8zt2dUqOKNZU8m9tV16vS3wvv19HCWUOq7nV8fD5tZq2nRPcY4kTsP09WH6frgHHffXcIXDKs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722836408498.7317732706108; Thu, 10 Oct 2019 08:53:56 -0700 (PDT) Received: from localhost ([::1]:41474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIalG-0007w5-OY for importer@patchew.org; Thu, 10 Oct 2019 11:53:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60894) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaK9-0006R7-St for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaK7-0004ci-Sg for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaK3-0004Zt-7f; Thu, 10 Oct 2019 11:25:47 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 437ED7F748; Thu, 10 Oct 2019 15:25:46 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B15CB19C69; Thu, 10 Oct 2019 15:25:45 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 15/23] iotests/201: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:49 +0200 Message-Id: <20191010152457.17713-16-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Thu, 10 Oct 2019 15:25:46 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/201 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 index 7abf740fe4..86fa37e714 100755 --- a/tests/qemu-iotests/201 +++ b/tests/qemu-iotests/201 @@ -24,7 +24,7 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 -MIG_SOCKET=3D"${TEST_DIR}/migrate" +MIG_SOCKET=3D"${SOCK_DIR}/migrate" =20 # get standard environment, filters and checks . ./common.rc --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721566; cv=none; d=zoho.com; s=zohoarc; b=GGfevYvvHgGyEW9favQaKxPL937c1g/yhPKPivoMpvjacwYQPrLe/dphiLqa7kEHBxKg+QNsleuS23mntVvlWDNxKnQq6ORKktm1SGohfsA4ytUDOcKgqmv4Dt0CGBTLJD+DnhWlvg7VWR5LtV6E1p3rlJWHEHQZypuepyQVsTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721566; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OqB6ubydbfcysOYZd/R1+qSNbDWlVk/xea0c/LOQH98=; b=cPWYknQ6Yv7QMZzDUdxDI11Susyb6se5IvdwaIUpDEig5/WGDi5x1+9OUAvoGIqFe2QbKr/UyWa5u4vE/34cmdt/m5Wv+QoCQFLbh+JT7xsEfO66v5mFcl0hSLH8aY2ljkCggCCRHaOTcoIPvciRpme9PbDnAJMTHAYKLLEAMNc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721566526332.2009781562134; Thu, 10 Oct 2019 08:32:46 -0700 (PDT) Received: from localhost ([::1]:41150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaQk-0004KO-Rb for importer@patchew.org; Thu, 10 Oct 2019 11:32:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60900) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKA-0006Rj-7x for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaK8-0004d9-8H for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18428) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaK5-0004b2-Qf; Thu, 10 Oct 2019 11:25:49 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F12A910C0516; Thu, 10 Oct 2019 15:25:48 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6DCBA10018FF; Thu, 10 Oct 2019 15:25:48 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 16/23] iotests/205: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:50 +0200 Message-Id: <20191010152457.17713-17-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.65]); Thu, 10 Oct 2019 15:25:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/205 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205 index 76f6c5fa2b..4bb2c21e8b 100755 --- a/tests/qemu-iotests/205 +++ b/tests/qemu-iotests/205 @@ -24,7 +24,7 @@ import iotests import time from iotests import qemu_img_create, qemu_io, filter_qemu_io, QemuIoIntera= ctive =20 -nbd_sock =3D os.path.join(iotests.test_dir, 'nbd_sock') +nbd_sock =3D os.path.join(iotests.sock_dir, 'nbd_sock') nbd_uri =3D 'nbd+unix:///exp?socket=3D' + nbd_sock disk =3D os.path.join(iotests.test_dir, 'disk') =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722973; cv=none; d=zoho.com; s=zohoarc; b=RJXBUsswxq5gM8bSvQKShc75WBujsTRe9fY8Rq1DtQlJT/SmNJcnf9CZVxCEufBduTeWlPyvxAZELO2ruTAgbA+X0ecWWBrJn+NqUXIwhmoBSh5nhX7KB4ODvnu8mNbYUSO7naJ5/glTMTiSigxGijpq8c2HR9e3SXr9ReIQocg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722973; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=slCjDxUetRNWu24qsOAbB8Q1zZyzpSmNItQczj5ehbQ=; b=Fe2Cz87Vo5iDizZy/3dSrsXTivBpmYNgdjwasWoPbN9cxlvgZSNOw9YEutD4WRnXQ0XJY2oAmr2WAaXDU/BjpcPNjXxXm/7hayoYmryL0zGQDXFELSiZQ0BJK4ScQ24kAQEiE1XQj89D6MfUWVN+ZatTEBhq/LXAE6QTiTS8Cks= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722973914825.2103262395573; Thu, 10 Oct 2019 08:56:13 -0700 (PDT) Received: from localhost ([::1]:41514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIanU-0002O8-Qf for importer@patchew.org; Thu, 10 Oct 2019 11:56:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60919) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKB-0006Uy-UR for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKA-0004e6-SP for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55072) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaK8-0004cw-KT; Thu, 10 Oct 2019 11:25:52 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7C7E30BCBA2; Thu, 10 Oct 2019 15:25:51 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5147B60BE1; Thu, 10 Oct 2019 15:25:51 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 17/23] iotests/208: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:51 +0200 Message-Id: <20191010152457.17713-18-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 10 Oct 2019 15:25:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/208 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/208 b/tests/qemu-iotests/208 index 1e202388dc..546eb1de3e 100755 --- a/tests/qemu-iotests/208 +++ b/tests/qemu-iotests/208 @@ -26,7 +26,7 @@ iotests.verify_image_format(supported_fmts=3D['generic']) =20 with iotests.FilePath('disk.img') as disk_img_path, \ iotests.FilePath('disk-snapshot.img') as disk_snapshot_img_path, \ - iotests.FilePath('nbd.sock') as nbd_sock_path, \ + iotests.FilePath('nbd.sock', iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: =20 img_size =3D '10M' --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722905; cv=none; d=zoho.com; s=zohoarc; b=GziGwM+4hcRzrRCMtrkc6TfgXadRWZJ3Zpvz/O3zDMEQiKb6OhNNo0K7dIi0h5KBFlrF92OUEVUdo3PlP83aJxHdJofCwDXfX5xvSiI2QH3lvMLFjMPwgOa3gSP+y8Zv8SAsU4P1eOpmFyp63DlMuY9+bU5zoWvPGKpuZBojP7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722905; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eNPjZh4pnvTm3NKQN0vUHhoAoI2bjBSi5VrGVp4Z+us=; b=YYwaKcalMbtQx+4YIWy31Lpd2ZypFsViHf22kmr8d+vNnHLbLW1nZ3C7aajUCyiftWkwz0ut+FWd7ZwleWzegtLLt+6fAmlkdYmi6moMCdnuWqv+T5PDxJMiEqcH9Kw1Y3cVsYItoilDNYtfTPmBac4aNicGz6SyN3PAid6EGgs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722905564815.8439894851601; Thu, 10 Oct 2019 08:55:05 -0700 (PDT) Received: from localhost ([::1]:41496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIamM-0000rd-3A for importer@patchew.org; Thu, 10 Oct 2019 11:55:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60943) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKE-0006ZY-V5 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKE-0004fD-0P for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:25:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43118) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKB-0004eC-NT; Thu, 10 Oct 2019 11:25:55 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF11C1DC5; Thu, 10 Oct 2019 15:25:54 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A90460852; Thu, 10 Oct 2019 15:25:54 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 18/23] iotests/209: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:52 +0200 Message-Id: <20191010152457.17713-19-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Thu, 10 Oct 2019 15:25:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/209 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209 index 259e991ec6..e0f464bcbe 100755 --- a/tests/qemu-iotests/209 +++ b/tests/qemu-iotests/209 @@ -24,7 +24,8 @@ from iotests import qemu_img_create, qemu_io, qemu_img_ve= rbose, qemu_nbd, \ =20 iotests.verify_image_format(supported_fmts=3D['qcow2']) =20 -disk, nbd_sock =3D file_path('disk', 'nbd-sock') +disk =3D file_path('disk') +nbd_sock =3D file_path('nbd-sock', base_dir=3Diotests.sock_dir) nbd_uri =3D 'nbd+unix:///exp?socket=3D' + nbd_sock =20 qemu_img_create('-f', iotests.imgfmt, disk, '1M') --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570723159; cv=none; d=zoho.com; s=zohoarc; b=ODCPOCnyVNuPehQ2xDdp+lJ660yzaPXSej6nxvbwAYKNpBZGBAYV02e3bQZatkSMt4uhcYKcL5tSsfZGC5GJPfUfX3RKlGNX19+fOeH5ottugsijvPSMbH/FnXTHqJ9ByJxJPyjycvtuHMnSIi1BOQe2/uOvUoPfrviUrFb2dfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570723159; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xij+6OhqxC2o0DSoYNM/KBxX0fFHYpzXU9cM7I7OXlA=; b=X3JHPwDPJJJvMlUZbra7+jBZUIwrntMpkzRNcOpNYKxjLWaOA4KMmYueD+PukbI68zaIhZS5D1RMF+VByWML0CuwQ/85Awn7mMiiQCQkWSJoOKKjpd/stT+szlKVe2A1a7Mgl74l4IvVc/Ev8b0pEitO+DLPfF1XQa/jz/qc7D4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570723159688559.3814237379737; Thu, 10 Oct 2019 08:59:19 -0700 (PDT) Received: from localhost ([::1]:41544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaqU-0004y2-CN for importer@patchew.org; Thu, 10 Oct 2019 11:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60982) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKK-0006h0-Ul for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKJ-0004i9-RN for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKH-0004gB-Mj; Thu, 10 Oct 2019 11:26:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F0F38D5D88; Thu, 10 Oct 2019 15:25:59 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB7641054FF8; Thu, 10 Oct 2019 15:25:58 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 19/23] iotests/222: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:53 +0200 Message-Id: <20191010152457.17713-20-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Thu, 10 Oct 2019 15:25:59 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/222 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/222 b/tests/qemu-iotests/222 index 0ead56d574..3f9f934ad8 100644 --- a/tests/qemu-iotests/222 +++ b/tests/qemu-iotests/222 @@ -48,7 +48,7 @@ remainder =3D [("0xd5", "0x108000", "32k"), # Right-end = of partial-left [1] =20 with iotests.FilePath('base.img') as base_img_path, \ iotests.FilePath('fleece.img') as fleece_img_path, \ - iotests.FilePath('nbd.sock') as nbd_sock_path, \ + iotests.FilePath('nbd.sock', iotests.sock_dir) as nbd_sock_path, \ iotests.VM() as vm: =20 log('--- Setting up images ---') --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570721809; cv=none; d=zoho.com; s=zohoarc; b=hSzZkgeZHdrzf72zhB0EV76j2q17jBvXCnY8gBqDJp46uHDhxorb5UaLr9z6kJleNuJ6mXE3My3LNFdZFgRuYOw8tGJg02wNiOGTS5oxbmahREX9Tf9sAK9NqflJu1mn/yU7PmWJkoE8xsRaXR+KYaYY3cwlpGJi49XN9fRHdVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570721809; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nLtRHLyEewyoJzHOlHDLfGlDTrCqnGhI2+JshQzEmcA=; b=avOaa3asLi10Sbm79FUaCmhsUBvG+v5An+p2beC5YZmkl2+bRbKvmplGIZeWfaukk24GgMviqeJFdto9hdPc8SlEX1DUocEVlAaubpfpeCM0vVgPGv9wH/zAWqo7ZvY/9SCIXJDlOX/fM9131d5NHCST5BdQyBr9I18X1osC14E= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570721809003343.50564267683217; Thu, 10 Oct 2019 08:36:49 -0700 (PDT) Received: from localhost ([::1]:41210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaUh-0000rq-89 for importer@patchew.org; Thu, 10 Oct 2019 11:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32769) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKM-0006jx-NS for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKL-0004ih-CI for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39836) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKI-0004hM-PD; Thu, 10 Oct 2019 11:26:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 05D5710C092E; Thu, 10 Oct 2019 15:26:02 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9B86D50D04; Thu, 10 Oct 2019 15:26:01 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 20/23] iotests/223: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:54 +0200 Message-Id: <20191010152457.17713-21-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Thu, 10 Oct 2019 15:26:02 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/223 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 2ba3d8124b..b5a80e50bb 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -28,7 +28,7 @@ _cleanup() nbd_server_stop _cleanup_test_img _cleanup_qemu - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -125,11 +125,11 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-a= dd", "arguments":{"device":"n"}}' "error" # Attempt add without server _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start", "arguments":{"addr":{"type":"unix", - "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return" + "data":{"path":"'"$SOCK_DIR/nbd"'"}}}}' "return" _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start", "arguments":{"addr":{"type":"unix", - "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second serv= er -$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" + "data":{"path":"'"$SOCK_DIR/nbd"1'"}}}}' "error" # Attempt second serv= er +$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd" _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", "arguments":{"device":"n", "bitmap":"b"}}' "return" _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", @@ -145,14 +145,14 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-a= dd", _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", "arguments":{"device":"n", "name":"n2", "writable":true, "bitmap":"b2"}}' "return" -$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd" +$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd" =20 echo echo "=3D=3D=3D Contrast normal status to large granularity dirty-bitmap = =3D=3D=3D" echo =20 QEMU_IO_OPTIONS=3D$QEMU_IO_OPTIONS_NO_FMT -IMG=3D"driver=3Dnbd,export=3Dn,server.type=3Dunix,server.path=3D$TEST_DIR/= nbd" +IMG=3D"driver=3Dnbd,export=3Dn,server.type=3Dunix,server.path=3D$SOCK_DIR/= nbd" $QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m = 1m' \ -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io $QEMU_IMG map --output=3Djson --image-opts \ @@ -164,7 +164,7 @@ echo echo "=3D=3D=3D Contrast to small granularity dirty-bitmap =3D=3D=3D" echo =20 -IMG=3D"driver=3Dnbd,export=3Dn2,server.type=3Dunix,server.path=3D$TEST_DIR= /nbd" +IMG=3D"driver=3Dnbd,export=3Dn2,server.type=3Dunix,server.path=3D$SOCK_DIR= /nbd" $QEMU_IMG map --output=3Djson --image-opts \ "$IMG,x-dirty-bitmap=3Dqemu:dirty-bitmap:b2" | _filter_qemu_img_map =20 --=20 2.21.0 From nobody Wed Nov 12 11:51:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1570722017; cv=none; d=zoho.com; s=zohoarc; b=MnCeNdfKC5zUaZJPcEGPsFDzJumJYth6mWkQPNwVyHff9uXGcONSIATaQc+8SpTWEjgGSY1aJx6qMOSFQwJHgSlxZVwI2EImKv2WFbWmIn3TP5p3nP6k+Ahk9xTe57qwLd+qMXMWrdz8M2orm1TJKbVI1dh4EBoREy6UYdV43QI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1570722017; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nxK6xSwuk5eC6BWIs/IOmX0TYclPhcyIauonETEu9co=; b=YfvyR149D3CBCaSn/9GafvIuaqLiB8FoP5iaOgjCTZLq7h67UE6cjvZ8/Jixyu0AaHiNMjUcqLFkSoC/ij3OvBl/Sbtl3QPa9cbZfy69ukCyhSpdXzIXSjCVdKXLhYU/VgB803AhHUN8qvOBJngmzRXysBRv/ggtMjHtffaF6Ks= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722017886950.4990450831389; Thu, 10 Oct 2019 08:40:17 -0700 (PDT) Received: from localhost ([::1]:41260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaY2-0004i7-Kx for importer@patchew.org; Thu, 10 Oct 2019 11:40:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32797) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKP-0006o6-1N for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKO-0004jb-1K for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35112) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKL-0004iR-A0; Thu, 10 Oct 2019 11:26:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8AF103164683; Thu, 10 Oct 2019 15:26:04 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 069C2194B6; Thu, 10 Oct 2019 15:26:03 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 21/23] iotests/240: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:55 +0200 Message-Id: <20191010152457.17713-22-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 10 Oct 2019 15:26:04 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/240 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240 index f73bc07d80..8b4337b58d 100755 --- a/tests/qemu-iotests/240 +++ b/tests/qemu-iotests/240 @@ -29,7 +29,7 @@ status=3D1 # failure is the default! =20 _cleanup() { - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -135,7 +135,7 @@ echo run_qemu < (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570722260718152.61918474492984; Thu, 10 Oct 2019 08:44:20 -0700 (PDT) Received: from localhost ([::1]:41356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIabw-000095-9X for importer@patchew.org; Thu, 10 Oct 2019 11:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32828) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKS-0006tB-3Y for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKQ-0004lK-UY for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKO-0004jY-Gv; Thu, 10 Oct 2019 11:26:08 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B763389F38E; Thu, 10 Oct 2019 15:26:07 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 33D7C194B6; Thu, 10 Oct 2019 15:26:07 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 22/23] iotests/267: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:56 +0200 Message-Id: <20191010152457.17713-23-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Thu, 10 Oct 2019 15:26:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/267 | 4 ++-- tests/qemu-iotests/267.out | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 index d37a67c012..170e173c0a 100755 --- a/tests/qemu-iotests/267 +++ b/tests/qemu-iotests/267 @@ -29,7 +29,7 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_DIR/nbd" + rm -f "$SOCK_DIR/nbd" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -143,7 +143,7 @@ echo =20 IMGOPTS=3D"backing_file=3D$TEST_IMG.base" _make_test_img $size cat < (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1570723082448955.1853516822418; Thu, 10 Oct 2019 08:58:02 -0700 (PDT) Received: from localhost ([::1]:41524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIap5-0003lK-Dn for importer@patchew.org; Thu, 10 Oct 2019 11:57:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32866) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIaKU-0006y9-W2 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIaKT-0004mH-UZ for qemu-devel@nongnu.org; Thu, 10 Oct 2019 11:26:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIaKR-0004lO-J0; Thu, 10 Oct 2019 11:26:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB94530BCBB4; Thu, 10 Oct 2019 15:26:10 +0000 (UTC) Received: from localhost (unknown [10.36.118.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 41899194B6; Thu, 10 Oct 2019 15:26:10 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 23/23] iotests: Drop TEST_DIR filter from _filter_nbd Date: Thu, 10 Oct 2019 17:24:57 +0200 Message-Id: <20191010152457.17713-24-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Thu, 10 Oct 2019 15:26:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Sockets should be placed into $SOCK_DIR instead of $TEST_DIR, so remove the $TEST_DIR filter from _filter_nbd. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/common.filter | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.f= ilter index cd42f5e7e3..f870e00e44 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -221,7 +221,6 @@ _filter_nbd() # Filter out the TCP port number since this changes between runs. $SED -e '/nbd\/.*\.c:/d' \ -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ - -e "s#?socket=3D$SOCK_DIR#?socket=3DTEST_DIR#g" \ -e "s#?socket=3D$SOCK_DIR#?socket=3DSOCK_DIR#g" \ -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } --=20 2.21.0