Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807730/?format=api
{ "id": 807730, "url": "http://patchwork.ozlabs.org/api/patches/807730/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/9b840c1229f3e25cf8ccf0d27bfabf37c751d5e1.1504111803.git.jcody@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<9b840c1229f3e25cf8ccf0d27bfabf37c751d5e1.1504111803.git.jcody@redhat.com>", "list_archive_url": null, "date": "2017-08-30T16:52:44", "name": "[v3,2/5] qemu-iotests: remove file cleanup from bash tests", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "cc0ea2dd86473e0f5ad25eb439e1bd4c2826fae8", "submitter": { "id": 12159, "url": "http://patchwork.ozlabs.org/api/people/12159/?format=api", "name": "Jeff Cody", "email": "jcody@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/9b840c1229f3e25cf8ccf0d27bfabf37c751d5e1.1504111803.git.jcody@redhat.com/mbox/", "series": [ { "id": 657, "url": "http://patchwork.ozlabs.org/api/series/657/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=657", "date": "2017-08-30T16:52:47", "name": "qemu-iotests: place output in unique dir", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/657/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807730/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807730/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jcody@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBYn16pXz9sPt\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 02:59:25 +1000 (AEST)", "from localhost ([::1]:51644 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dn6Ko-0006gC-8b\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 12:59:22 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:56422)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <jcody@redhat.com>) id 1dn6F0-0001Ud-Lb\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:29 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <jcody@redhat.com>) id 1dn6Et-0004yX-Kp\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:22 -0400", "from mx1.redhat.com ([209.132.183.28]:36228)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <jcody@redhat.com>)\n\tid 1dn6Ee-0004rr-EI; Wed, 30 Aug 2017 12:53:00 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 593C5BDE3;\n\tWed, 30 Aug 2017 16:52:59 +0000 (UTC)", "from localhost (ovpn-116-70.phx2.redhat.com [10.3.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id E73598D573;\n\tWed, 30 Aug 2017 16:52:54 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 593C5BDE3", "From": "Jeff Cody <jcody@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 30 Aug 2017 12:52:44 -0400", "Message-Id": "<9b840c1229f3e25cf8ccf0d27bfabf37c751d5e1.1504111803.git.jcody@redhat.com>", "In-Reply-To": [ "<cover.1504111803.git.jcody@redhat.com>", "<cover.1504111803.git.jcody@redhat.com>" ], "References": [ "<cover.1504111803.git.jcody@redhat.com>", "<cover.1504111803.git.jcody@redhat.com>" ], "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tWed, 30 Aug 2017 16:52:59 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH v3 2/5] qemu-iotests: remove file cleanup from\n\tbash tests", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "kwolf@redhat.com, qemu-block@nongnu.org, armbru@redhat.com,\n\tstefanha@redhat.com, jsnow@redhat.com", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "All files for a given test are now self-contained in a subdirectory,\nand therefore the \"./check\" script can do all file-related cleanup\nwithout any help.\n\nThis removes file cleanups from the bash tests. The only cleanup left\nis whatever is needed to kill any spawned processes; e.g. _cleanup_qemu.\n\nReviewed-by: Eric Blake <eblake@redhat.com>\nSigned-off-by: Jeff Cody <jcody@redhat.com>\n---\n tests/qemu-iotests/001 | 6 ------\n tests/qemu-iotests/002 | 6 ------\n tests/qemu-iotests/003 | 6 ------\n tests/qemu-iotests/004 | 6 ------\n tests/qemu-iotests/005 | 6 ------\n tests/qemu-iotests/007 | 7 -------\n tests/qemu-iotests/008 | 6 ------\n tests/qemu-iotests/009 | 6 ------\n tests/qemu-iotests/010 | 6 ------\n tests/qemu-iotests/011 | 6 ------\n tests/qemu-iotests/012 | 6 ------\n tests/qemu-iotests/013 | 6 ------\n tests/qemu-iotests/014 | 6 ------\n tests/qemu-iotests/015 | 7 -------\n tests/qemu-iotests/017 | 6 ------\n tests/qemu-iotests/018 | 6 ------\n tests/qemu-iotests/019 | 8 --------\n tests/qemu-iotests/020 | 8 --------\n tests/qemu-iotests/021 | 6 ------\n tests/qemu-iotests/022 | 6 ------\n tests/qemu-iotests/023 | 6 ------\n tests/qemu-iotests/024 | 8 --------\n tests/qemu-iotests/025 | 6 ------\n tests/qemu-iotests/026 | 7 -------\n tests/qemu-iotests/027 | 6 ------\n tests/qemu-iotests/028 | 8 --------\n tests/qemu-iotests/029 | 7 -------\n tests/qemu-iotests/031 | 6 ------\n tests/qemu-iotests/032 | 6 ------\n tests/qemu-iotests/033 | 6 ------\n tests/qemu-iotests/034 | 6 ------\n tests/qemu-iotests/035 | 6 ------\n tests/qemu-iotests/036 | 6 ------\n tests/qemu-iotests/037 | 6 ------\n tests/qemu-iotests/038 | 6 ------\n tests/qemu-iotests/039 | 6 ------\n tests/qemu-iotests/042 | 6 ------\n tests/qemu-iotests/043 | 7 -------\n tests/qemu-iotests/046 | 6 ------\n tests/qemu-iotests/047 | 6 ------\n tests/qemu-iotests/048 | 8 --------\n tests/qemu-iotests/048.out | 1 -\n tests/qemu-iotests/049 | 6 ------\n tests/qemu-iotests/050 | 8 --------\n tests/qemu-iotests/051 | 6 ------\n tests/qemu-iotests/052 | 6 ------\n tests/qemu-iotests/053 | 7 -------\n tests/qemu-iotests/054 | 6 ------\n tests/qemu-iotests/058 | 8 +-------\n tests/qemu-iotests/059 | 7 -------\n tests/qemu-iotests/060 | 6 ------\n tests/qemu-iotests/061 | 6 ------\n tests/qemu-iotests/062 | 6 ------\n tests/qemu-iotests/063 | 7 -------\n tests/qemu-iotests/064 | 6 ------\n tests/qemu-iotests/066 | 6 ------\n tests/qemu-iotests/068 | 6 ------\n tests/qemu-iotests/069 | 6 ------\n tests/qemu-iotests/070 | 6 ------\n tests/qemu-iotests/071 | 6 ------\n tests/qemu-iotests/072 | 6 ------\n tests/qemu-iotests/073 | 6 ------\n tests/qemu-iotests/074 | 9 ---------\n tests/qemu-iotests/074.out | 1 -\n tests/qemu-iotests/075 | 6 ------\n tests/qemu-iotests/076 | 6 ------\n tests/qemu-iotests/077 | 6 ------\n tests/qemu-iotests/078 | 6 ------\n tests/qemu-iotests/079 | 6 ------\n tests/qemu-iotests/080 | 7 -------\n tests/qemu-iotests/081 | 8 --------\n tests/qemu-iotests/082 | 6 ------\n tests/qemu-iotests/084 | 6 ------\n tests/qemu-iotests/085 | 13 +------------\n tests/qemu-iotests/086 | 6 ------\n tests/qemu-iotests/088 | 7 -------\n tests/qemu-iotests/089 | 6 ------\n tests/qemu-iotests/090 | 6 ------\n tests/qemu-iotests/091 | 8 +-------\n tests/qemu-iotests/092 | 7 -------\n tests/qemu-iotests/094 | 9 +--------\n tests/qemu-iotests/095 | 8 +-------\n tests/qemu-iotests/097 | 7 -------\n tests/qemu-iotests/098 | 7 -------\n tests/qemu-iotests/099 | 6 ------\n tests/qemu-iotests/101 | 6 ------\n tests/qemu-iotests/102 | 7 +------\n tests/qemu-iotests/103 | 6 ------\n tests/qemu-iotests/104 | 2 --\n tests/qemu-iotests/105 | 6 ------\n tests/qemu-iotests/106 | 6 ------\n tests/qemu-iotests/107 | 6 ------\n tests/qemu-iotests/108 | 6 ------\n tests/qemu-iotests/109 | 8 +-------\n tests/qemu-iotests/110 | 6 ------\n tests/qemu-iotests/111 | 6 ------\n tests/qemu-iotests/112 | 6 ------\n tests/qemu-iotests/113 | 6 ------\n tests/qemu-iotests/114 | 6 ------\n tests/qemu-iotests/115 | 6 ------\n tests/qemu-iotests/116 | 6 ------\n tests/qemu-iotests/117 | 7 +------\n tests/qemu-iotests/119 | 6 ------\n tests/qemu-iotests/120 | 6 ------\n tests/qemu-iotests/121 | 6 ------\n tests/qemu-iotests/122 | 7 -------\n tests/qemu-iotests/123 | 7 -------\n tests/qemu-iotests/125 | 6 ------\n tests/qemu-iotests/130 | 7 +------\n tests/qemu-iotests/131 | 6 ------\n tests/qemu-iotests/133 | 6 ------\n tests/qemu-iotests/134 | 6 ------\n tests/qemu-iotests/135 | 6 ------\n tests/qemu-iotests/137 | 6 ------\n tests/qemu-iotests/138 | 6 ------\n tests/qemu-iotests/140 | 8 +-------\n tests/qemu-iotests/141 | 8 +-------\n tests/qemu-iotests/142 | 7 -------\n tests/qemu-iotests/143 | 7 +------\n tests/qemu-iotests/144 | 8 +-------\n tests/qemu-iotests/145 | 7 -------\n tests/qemu-iotests/146 | 7 +------\n tests/qemu-iotests/150 | 6 ------\n tests/qemu-iotests/153 | 12 ------------\n tests/qemu-iotests/154 | 6 ------\n tests/qemu-iotests/156 | 7 +------\n tests/qemu-iotests/157 | 6 ------\n tests/qemu-iotests/158 | 6 ------\n tests/qemu-iotests/159 | 7 -------\n tests/qemu-iotests/160 | 7 -------\n tests/qemu-iotests/162 | 7 -------\n tests/qemu-iotests/170 | 7 -------\n tests/qemu-iotests/171 | 6 ------\n tests/qemu-iotests/172 | 8 --------\n tests/qemu-iotests/173 | 8 +-------\n tests/qemu-iotests/174 | 6 ------\n tests/qemu-iotests/175 | 6 ------\n tests/qemu-iotests/176 | 7 -------\n tests/qemu-iotests/177 | 6 ------\n tests/qemu-iotests/178 | 7 -------\n tests/qemu-iotests/179 | 7 -------\n tests/qemu-iotests/181 | 8 +-------\n tests/qemu-iotests/182 | 6 ------\n tests/qemu-iotests/183 | 9 +--------\n tests/qemu-iotests/185 | 9 +--------\n tests/qemu-iotests/186 | 6 ------\n tests/qemu-iotests/187 | 8 --------\n tests/qemu-iotests/188 | 6 ------\n tests/qemu-iotests/189 | 6 ------\n tests/qemu-iotests/190 | 7 -------\n tests/qemu-iotests/192 | 6 ------\n 151 files changed, 19 insertions(+), 965 deletions(-)", "diff": "diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001\nindex ffd14e2..6f71879 100755\n--- a/tests/qemu-iotests/001\n+++ b/tests/qemu-iotests/001\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002\nindex d4f8e91..4c9ff23 100755\n--- a/tests/qemu-iotests/002\n+++ b/tests/qemu-iotests/002\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003\nindex 19889b9..2648d03 100755\n--- a/tests/qemu-iotests/003\n+++ b/tests/qemu-iotests/003\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004\nindex 6f2aa3d..99743b4 100755\n--- a/tests/qemu-iotests/004\n+++ b/tests/qemu-iotests/004\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005\nindex 4447377..23a77e0 100755\n--- a/tests/qemu-iotests/005\n+++ b/tests/qemu-iotests/005\n@@ -30,12 +30,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007\nindex fa543ee..c8068e5 100755\n--- a/tests/qemu-iotests/007\n+++ b/tests/qemu-iotests/007\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-\ttrue\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008\nindex 8e89d74..7f7f8ae 100755\n--- a/tests/qemu-iotests/008\n+++ b/tests/qemu-iotests/008\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009\nindex 16e4475..e03412a 100755\n--- a/tests/qemu-iotests/009\n+++ b/tests/qemu-iotests/009\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010\nindex 151dac2..8608848 100755\n--- a/tests/qemu-iotests/010\n+++ b/tests/qemu-iotests/010\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011\nindex f8d044e..0c0d15f 100755\n--- a/tests/qemu-iotests/011\n+++ b/tests/qemu-iotests/011\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012\nindex 01a770d..aa9cfb4 100755\n--- a/tests/qemu-iotests/012\n+++ b/tests/qemu-iotests/012\n@@ -29,12 +29,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013\nindex d013f87..0ff9c4d 100755\n--- a/tests/qemu-iotests/013\n+++ b/tests/qemu-iotests/013\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014\nindex 2ea79e8..3dee9f7 100755\n--- a/tests/qemu-iotests/014\n+++ b/tests/qemu-iotests/014\n@@ -29,12 +29,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015\nindex aaf9c3f..d29a778 100755\n--- a/tests/qemu-iotests/015\n+++ b/tests/qemu-iotests/015\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-\ttrue\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017\nindex 4f9302d..994ea0e 100755\n--- a/tests/qemu-iotests/017\n+++ b/tests/qemu-iotests/017\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018\nindex 1d39d35..11ad2b1 100755\n--- a/tests/qemu-iotests/018\n+++ b/tests/qemu-iotests/018\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019\nindex 24a789a..3728193 100755\n--- a/tests/qemu-iotests/019\n+++ b/tests/qemu-iotests/019\n@@ -29,14 +29,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm -f \"$TEST_IMG.base\"\n- rm -f \"$TEST_IMG.orig\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020\nindex 7a11110..37cd5d1 100755\n--- a/tests/qemu-iotests/020\n+++ b/tests/qemu-iotests/020\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm -f \"$TEST_IMG.base\"\n- rm -f \"$TEST_IMG.orig\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021\nindex 11e8ed7..5ab2acb 100755\n--- a/tests/qemu-iotests/021\n+++ b/tests/qemu-iotests/021\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022\nindex 2452a9f..4870b17 100755\n--- a/tests/qemu-iotests/022\n+++ b/tests/qemu-iotests/022\n@@ -29,12 +29,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023\nindex 497ae1e..5a2bf4e 100755\n--- a/tests/qemu-iotests/023\n+++ b/tests/qemu-iotests/023\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024\nindex e0d77ce..3e638d9 100755\n--- a/tests/qemu-iotests/024\n+++ b/tests/qemu-iotests/024\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-\trm -f \"$TEST_DIR/t.$IMGFMT.base_old\"\n-\trm -f \"$TEST_DIR/t.$IMGFMT.base_new\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025\nindex f5e672e..93634c1 100755\n--- a/tests/qemu-iotests/025\n+++ b/tests/qemu-iotests/025\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026\nindex 7fadfba..dc4ff9f 100755\n--- a/tests/qemu-iotests/026\n+++ b/tests/qemu-iotests/026\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm \"$TEST_DIR/blkdebug.conf\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027\nindex 08593da..c3f9146 100755\n--- a/tests/qemu-iotests/027\n+++ b/tests/qemu-iotests/027\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028\nindex 97a8869..3176789 100755\n--- a/tests/qemu-iotests/028\n+++ b/tests/qemu-iotests/028\n@@ -30,14 +30,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"${TEST_IMG}.copy\"\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029\nindex 30bab24..981a864 100755\n--- a/tests/qemu-iotests/029\n+++ b/tests/qemu-iotests/029\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f $TEST_IMG.snap\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031\nindex 1e08abc..6805c2c 100755\n--- a/tests/qemu-iotests/031\n+++ b/tests/qemu-iotests/031\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032\nindex 24bcb52..dafcfb8 100755\n--- a/tests/qemu-iotests/032\n+++ b/tests/qemu-iotests/032\n@@ -29,12 +29,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033\nindex 2cdfd13..bf3c59c 100755\n--- a/tests/qemu-iotests/033\n+++ b/tests/qemu-iotests/033\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034\nindex 1b28bda..830b0db 100755\n--- a/tests/qemu-iotests/034\n+++ b/tests/qemu-iotests/034\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035\nindex efc38e4..a79a4fd 100755\n--- a/tests/qemu-iotests/035\n+++ b/tests/qemu-iotests/035\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036\nindex ce638d6..841f347 100755\n--- a/tests/qemu-iotests/036\n+++ b/tests/qemu-iotests/036\n@@ -30,12 +30,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037\nindex c476b82..756fc2c 100755\n--- a/tests/qemu-iotests/037\n+++ b/tests/qemu-iotests/037\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038\nindex d99a150..cf730ae 100755\n--- a/tests/qemu-iotests/038\n+++ b/tests/qemu-iotests/038\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039\nindex 1f48339..dd483c4 100755\n--- a/tests/qemu-iotests/039\n+++ b/tests/qemu-iotests/039\n@@ -30,12 +30,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042\nindex a53e7cb..0efeec6 100755\n--- a/tests/qemu-iotests/042\n+++ b/tests/qemu-iotests/042\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043\nindex 1c6c22d..48b71fe 100755\n--- a/tests/qemu-iotests/043\n+++ b/tests/qemu-iotests/043\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG\".[123].base\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046\nindex f2ebecf..362ed94 100755\n--- a/tests/qemu-iotests/046\n+++ b/tests/qemu-iotests/046\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047\nindex 1b8f3d4..1850035 100755\n--- a/tests/qemu-iotests/047\n+++ b/tests/qemu-iotests/047\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048\nindex 9ed04a0..c95bd2f 100755\n--- a/tests/qemu-iotests/048\n+++ b/tests/qemu-iotests/048\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n \n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- echo \"Cleanup\"\n- _cleanup_test_img\n- rm \"${TEST_IMG_FILE2}\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n _compare()\n {\n $QEMU_IMG compare $QEMU_IMG_EXTRA_ARGS \"$@\" \"$TEST_IMG\" \"${TEST_IMG2}\"\ndiff --git a/tests/qemu-iotests/048.out b/tests/qemu-iotests/048.out\nindex 0bcf663..3318eed 100644\n--- a/tests/qemu-iotests/048.out\n+++ b/tests/qemu-iotests/048.out\n@@ -39,4 +39,3 @@ wrote 512/512 bytes at offset 512\n 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)\n Content mismatch at offset 512!\n 1\n-Cleanup\ndiff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049\nindex df35b6d..00733a6 100755\n--- a/tests/qemu-iotests/049\n+++ b/tests/qemu-iotests/049\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050\nindex 03b4a5d..e3b6d8c 100755\n--- a/tests/qemu-iotests/050\n+++ b/tests/qemu-iotests/050\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.old\"\n- rm -f \"$TEST_IMG.new\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051\nindex c8cfc76..7060c3e 100755\n--- a/tests/qemu-iotests/051\n+++ b/tests/qemu-iotests/051\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052\nindex 842eace..fc23fad 100755\n--- a/tests/qemu-iotests/052\n+++ b/tests/qemu-iotests/052\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053\nindex 2a04f5f..e8b9037 100755\n--- a/tests/qemu-iotests/053\n+++ b/tests/qemu-iotests/053\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\trm -f \"$TEST_IMG.orig\"\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054\nindex bf47ef9..e2de997 100755\n--- a/tests/qemu-iotests/054\n+++ b/tests/qemu-iotests/054\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058\nindex 2253c6a..a842fe4 100755\n--- a/tests/qemu-iotests/058\n+++ b/tests/qemu-iotests/058\n@@ -75,13 +75,7 @@ _export_nbd_snapshot1()\n _wait_for_nbd\n }\n \n-_cleanup()\n-{\n- _cleanup_nbd\n- _cleanup_test_img\n- rm -f \"$converted_image\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_nbd; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059\nindex a1c34ee..6ccd250 100755\n--- a/tests/qemu-iotests/059\n+++ b/tests/qemu-iotests/059\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.qcow2\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060\nindex 8e95c45..6532837 100755\n--- a/tests/qemu-iotests/060\n+++ b/tests/qemu-iotests/060\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061\nindex f5678b1..1346dd9 100755\n--- a/tests/qemu-iotests/061\n+++ b/tests/qemu-iotests/061\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062\nindex 051fb9f..3a1df0d 100755\n--- a/tests/qemu-iotests/062\n+++ b/tests/qemu-iotests/062\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063\nindex e4f6ea9..4a9fc44 100755\n--- a/tests/qemu-iotests/063\n+++ b/tests/qemu-iotests/063\n@@ -28,13 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-\trm -f \"$TEST_IMG.orig\" \"$TEST_IMG.raw1\" \"$TEST_IMG.raw2\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/064 b/tests/qemu-iotests/064\nindex 5792fbb..211c541 100755\n--- a/tests/qemu-iotests/064\n+++ b/tests/qemu-iotests/064\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066\nindex 8638217..e811f48 100755\n--- a/tests/qemu-iotests/066\n+++ b/tests/qemu-iotests/066\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068\nindex cfa0f2a..dd98227 100755\n--- a/tests/qemu-iotests/068\n+++ b/tests/qemu-iotests/068\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069\nindex 96e55ef..03d5a3c 100755\n--- a/tests/qemu-iotests/069\n+++ b/tests/qemu-iotests/069\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/070 b/tests/qemu-iotests/070\nindex 8d08d74..1220cc1 100755\n--- a/tests/qemu-iotests/070\n+++ b/tests/qemu-iotests/070\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071\nindex 48b4955..1a8d6e7 100755\n--- a/tests/qemu-iotests/071\n+++ b/tests/qemu-iotests/071\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072\nindex aa027c7..8aaf3fd 100755\n--- a/tests/qemu-iotests/072\n+++ b/tests/qemu-iotests/072\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073\nindex 40f85b1..c19ad0d 100755\n--- a/tests/qemu-iotests/073\n+++ b/tests/qemu-iotests/073\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074\nindex b17866b..d7888ab 100755\n--- a/tests/qemu-iotests/074\n+++ b/tests/qemu-iotests/074\n@@ -27,15 +27,6 @@ echo \"QA output created by $seq\"\n \n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- echo \"Cleanup\"\n- _cleanup_test_img\n- rm \"${TEST_IMG2}\"\n- rm -f \"$TEST_DIR/blkdebug.conf\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n _compare()\n {\n $QEMU_IMG compare \"$@\" \"$TEST_IMG\" \"${TEST_IMG2}\"\ndiff --git a/tests/qemu-iotests/074.out b/tests/qemu-iotests/074.out\nindex 8fba5ae..fb93965 100644\n--- a/tests/qemu-iotests/074.out\n+++ b/tests/qemu-iotests/074.out\n@@ -15,4 +15,3 @@ qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_D\n qemu-img: Error while reading offset 0 of blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT: Input/output error\n Warning: Image size mismatch!\n 4\n-Cleanup\ndiff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075\nindex 770d51c..c2509d1 100755\n--- a/tests/qemu-iotests/075\n+++ b/tests/qemu-iotests/075\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076\nindex ef9e6a4..69bccad 100755\n--- a/tests/qemu-iotests/076\n+++ b/tests/qemu-iotests/076\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/077 b/tests/qemu-iotests/077\nindex d2d2a2d..4a458e1 100755\n--- a/tests/qemu-iotests/077\n+++ b/tests/qemu-iotests/077\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078\nindex f333e9a..22d078e 100755\n--- a/tests/qemu-iotests/078\n+++ b/tests/qemu-iotests/078\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079\nindex b2e3f74..fba6ec6 100755\n--- a/tests/qemu-iotests/079\n+++ b/tests/qemu-iotests/079\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080\nindex 55044c7..be548a9 100755\n--- a/tests/qemu-iotests/080\n+++ b/tests/qemu-iotests/080\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f $TEST_IMG.snap\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081\nindex da3fb09..2dadc16 100755\n--- a/tests/qemu-iotests/081\n+++ b/tests/qemu-iotests/081\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -rf $TEST_DIR/1.raw\n- rm -rf $TEST_DIR/2.raw\n- rm -rf $TEST_DIR/3.raw\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082\nindex d5c83d4..aa585db 100755\n--- a/tests/qemu-iotests/082\n+++ b/tests/qemu-iotests/082\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084\nindex 04f2aa9..b0d42a0 100755\n--- a/tests/qemu-iotests/084\n+++ b/tests/qemu-iotests/084\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085\nindex 5c7668c..7b69f86 100755\n--- a/tests/qemu-iotests/085\n+++ b/tests/qemu-iotests/085\n@@ -37,18 +37,7 @@ snapshot_virt1=\"snapshot-v1.qcow2\"\n \n SNAPSHOTS=10\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- for i in $(seq 1 ${SNAPSHOTS})\n- do\n- rm -f \"${TEST_DIR}/${i}-${snapshot_virt0}\"\n- rm -f \"${TEST_DIR}/${i}-${snapshot_virt1}\"\n- done\n- rm -f \"${TEST_IMG}\" \"${TEST_IMG}.1\" \"${TEST_IMG}.2\" \"${TEST_IMG}.base\"\n-\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086\nindex cd4494a..4d5f7db 100755\n--- a/tests/qemu-iotests/086\n+++ b/tests/qemu-iotests/086\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088\nindex b8076f2..72e7c68 100755\n--- a/tests/qemu-iotests/088\n+++ b/tests/qemu-iotests/088\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f $TEST_IMG.snap\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089\nindex 9bfe230..75151f1 100755\n--- a/tests/qemu-iotests/089\n+++ b/tests/qemu-iotests/089\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090\nindex 7380503..c3be13c 100755\n--- a/tests/qemu-iotests/090\n+++ b/tests/qemu-iotests/090\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091\nindex 10ac4a8..c4df2fb 100755\n--- a/tests/qemu-iotests/091\n+++ b/tests/qemu-iotests/091\n@@ -31,13 +31,7 @@ status=1 # failure is the default!\n \n MIG_FIFO=\"${TEST_DIR}/migrate\"\n \n-_cleanup()\n-{\n- rm -f \"${MIG_FIFO}\"\n- _cleanup_qemu\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092\nindex 5bbdd07..3b8cf8f 100755\n--- a/tests/qemu-iotests/092\n+++ b/tests/qemu-iotests/092\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f $TEST_IMG.snap\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094\nindex 9aa01e3..35e882c 100755\n--- a/tests/qemu-iotests/094\n+++ b/tests/qemu-iotests/094\n@@ -27,14 +27,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n- rm -f \"$TEST_DIR/source.$IMGFMT\"\n-}\n-\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095\nindex 030adb2..75d60c4 100755\n--- a/tests/qemu-iotests/095\n+++ b/tests/qemu-iotests/095\n@@ -30,13 +30,7 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"${TEST_IMG}.base\" \"${TEST_IMG}.snp1\"\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097\nindex e22670c..81e6729 100755\n--- a/tests/qemu-iotests/097\n+++ b/tests/qemu-iotests/097\n@@ -28,13 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- _rm_test_img \"$TEST_IMG.itmd\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098\nindex b002e96..24d8510 100755\n--- a/tests/qemu-iotests/098\n+++ b/tests/qemu-iotests/098\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_DIR/blkdebug.conf\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099\nindex caaf58e..d811b34 100755\n--- a/tests/qemu-iotests/099\n+++ b/tests/qemu-iotests/099\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/101 b/tests/qemu-iotests/101\nindex ea53f8b..62faf99 100755\n--- a/tests/qemu-iotests/101\n+++ b/tests/qemu-iotests/101\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102\nindex 87db1bb..084d2cf 100755\n--- a/tests/qemu-iotests/102\n+++ b/tests/qemu-iotests/102\n@@ -27,12 +27,7 @@ echo \"QA output created by $seq\"\n here=$PWD\n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and qemu instance handling\n . ./common.rc\ndiff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103\nindex ecbd8eb..df86d4f 100755\n--- a/tests/qemu-iotests/103\n+++ b/tests/qemu-iotests/103\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=$PWD\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104\nindex 726d467..f10d311 100755\n--- a/tests/qemu-iotests/104\n+++ b/tests/qemu-iotests/104\n@@ -27,8 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-trap \"exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105\nindex 3db4ce3..b469b1b 100755\n--- a/tests/qemu-iotests/105\n+++ b/tests/qemu-iotests/105\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106\nindex 3264957..b571971 100755\n--- a/tests/qemu-iotests/106\n+++ b/tests/qemu-iotests/106\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=$PWD\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment and filters\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107\nindex d7222dc..d513120 100755\n--- a/tests/qemu-iotests/107\n+++ b/tests/qemu-iotests/107\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108\nindex 2355d98..8371db4 100755\n--- a/tests/qemu-iotests/108\n+++ b/tests/qemu-iotests/108\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109\nindex d70b574..d4fca99 100755\n--- a/tests/qemu-iotests/109\n+++ b/tests/qemu-iotests/109\n@@ -27,13 +27,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f $TEST_IMG.src\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110\nindex 9de7369..93dd09f 100755\n--- a/tests/qemu-iotests/110\n+++ b/tests/qemu-iotests/110\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111\nindex a1c152d..f590d82 100755\n--- a/tests/qemu-iotests/111\n+++ b/tests/qemu-iotests/111\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112\nindex 28eb9aa..ee3679e 100755\n--- a/tests/qemu-iotests/112\n+++ b/tests/qemu-iotests/112\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/113 b/tests/qemu-iotests/113\nindex 19b68b2..07437ea 100755\n--- a/tests/qemu-iotests/113\n+++ b/tests/qemu-iotests/113\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114\nindex 5b7dc54..5bfd473 100755\n--- a/tests/qemu-iotests/114\n+++ b/tests/qemu-iotests/114\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115\nindex 665c2ea..0c9aaad 100755\n--- a/tests/qemu-iotests/115\n+++ b/tests/qemu-iotests/115\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/116 b/tests/qemu-iotests/116\nindex df0172f..e687601 100755\n--- a/tests/qemu-iotests/116\n+++ b/tests/qemu-iotests/116\n@@ -30,12 +30,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117\nindex 6c83461..579cecb 100755\n--- a/tests/qemu-iotests/117\n+++ b/tests/qemu-iotests/117\n@@ -27,12 +27,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/119 b/tests/qemu-iotests/119\nindex 4f34fb4..8cdb404 100755\n--- a/tests/qemu-iotests/119\n+++ b/tests/qemu-iotests/119\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120\nindex f40b97d..bb0e2dd 100755\n--- a/tests/qemu-iotests/120\n+++ b/tests/qemu-iotests/120\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121\nindex 1307b4e..d75fce1 100755\n--- a/tests/qemu-iotests/121\n+++ b/tests/qemu-iotests/121\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122\nindex 45b359c..3942604 100755\n--- a/tests/qemu-iotests/122\n+++ b/tests/qemu-iotests/122\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f \"$TEST_IMG\".[123]\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123\nindex b18e3fc..98fd3ce 100755\n--- a/tests/qemu-iotests/123\n+++ b/tests/qemu-iotests/123\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$SRC_IMG\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125\nindex 9424313..bca5fb5 100755\n--- a/tests/qemu-iotests/125\n+++ b/tests/qemu-iotests/125\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=$PWD\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n get_image_size_on_host()\n {\n $QEMU_IMG info -f \"$IMGFMT\" \"$TEST_IMG\" | grep \"disk size\" \\\ndiff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130\nindex e7e43de..4aad4ea 100755\n--- a/tests/qemu-iotests/130\n+++ b/tests/qemu-iotests/130\n@@ -29,12 +29,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/131 b/tests/qemu-iotests/131\nindex 94a9ae7..52588ef 100755\n--- a/tests/qemu-iotests/131\n+++ b/tests/qemu-iotests/131\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133\nindex 9d35a6a..2d0aae9 100755\n--- a/tests/qemu-iotests/133\n+++ b/tests/qemu-iotests/133\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134\nindex 9914415..147ea2c 100755\n--- a/tests/qemu-iotests/134\n+++ b/tests/qemu-iotests/134\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/135 b/tests/qemu-iotests/135\nindex ce60831..75c160d 100755\n--- a/tests/qemu-iotests/135\n+++ b/tests/qemu-iotests/135\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137\nindex eb91e51..6068a13 100755\n--- a/tests/qemu-iotests/137\n+++ b/tests/qemu-iotests/137\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138\nindex 21650d8..9682560 100755\n--- a/tests/qemu-iotests/138\n+++ b/tests/qemu-iotests/138\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140\nindex f89d0d6..c5e1a5b 100755\n--- a/tests/qemu-iotests/140\n+++ b/tests/qemu-iotests/140\n@@ -31,13 +31,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n- rm -f \"$TEST_DIR/nbd\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141\nindex 2f9d7b9..cff2319 100755\n--- a/tests/qemu-iotests/141\n+++ b/tests/qemu-iotests/141\n@@ -27,13 +27,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n- rm -f \"$TEST_DIR\"/{b,m,o}.$IMGFMT\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142\nindex 1639c83..65775be 100755\n--- a/tests/qemu-iotests/142\n+++ b/tests/qemu-iotests/142\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f $TEST_IMG.snap\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143\nindex 5ff1944..b4736aa 100755\n--- a/tests/qemu-iotests/143\n+++ b/tests/qemu-iotests/143\n@@ -27,12 +27,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"$TEST_DIR/nbd\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144\nindex 00de3c3..b47c561 100755\n--- a/tests/qemu-iotests/144\n+++ b/tests/qemu-iotests/144\n@@ -32,13 +32,7 @@ status=1\t# failure is the default!\n TMP_SNAP1=${TEST_DIR}/tmp.qcow2\n TMP_SNAP2=${TEST_DIR}/tmp2.qcow2\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"${TEST_IMG}\" \"${TMP_SNAP1}\" \"${TMP_SNAP2}\"\n-}\n-\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145\nindex c371b3c..930628e 100755\n--- a/tests/qemu-iotests/145\n+++ b/tests/qemu-iotests/145\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-\ttrue\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/146 b/tests/qemu-iotests/146\nindex 043711b..99b1e81 100755\n--- a/tests/qemu-iotests/146\n+++ b/tests/qemu-iotests/146\n@@ -27,12 +27,7 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/150 b/tests/qemu-iotests/150\nindex ee8f637..120920e 100755\n--- a/tests/qemu-iotests/150\n+++ b/tests/qemu-iotests/150\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153\nindex fa25eb2..42882eb 100755\n--- a/tests/qemu-iotests/153\n+++ b/tests/qemu-iotests/153\n@@ -28,18 +28,6 @@ here=\"$PWD\"\n tmp=/tmp/$$\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"${TEST_IMG}.base\"\n- rm -f \"${TEST_IMG}.convert\"\n- rm -f \"${TEST_IMG}.a\"\n- rm -f \"${TEST_IMG}.b\"\n- rm -f \"${TEST_IMG}.c\"\n- rm -f \"${TEST_IMG}.lnk\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154\nindex fde03b0..90e7e65 100755\n--- a/tests/qemu-iotests/154\n+++ b/tests/qemu-iotests/154\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156\nindex e75dc4d..9dbc6d7 100755\n--- a/tests/qemu-iotests/156\n+++ b/tests/qemu-iotests/156\n@@ -35,12 +35,7 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"$TEST_IMG\"{,.target}{,.backing,.overlay}\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157\nindex 2bf02be..bda53c8 100755\n--- a/tests/qemu-iotests/157\n+++ b/tests/qemu-iotests/157\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158\nindex 24ac600..a07708e 100755\n--- a/tests/qemu-iotests/158\n+++ b/tests/qemu-iotests/158\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159\nindex 9b0e1ec..7fcccde 100755\n--- a/tests/qemu-iotests/159\n+++ b/tests/qemu-iotests/159\n@@ -26,13 +26,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.out\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n . ./common.rc\n . ./common.filter\n . ./common.pattern\ndiff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160\nindex 5c910e5..48dd25d 100755\n--- a/tests/qemu-iotests/160\n+++ b/tests/qemu-iotests/160\n@@ -26,13 +26,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.out\" \"$TEST_IMG.out.dd\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n . ./common.rc\n . ./common.filter\n . ./common.pattern\ndiff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162\nindex 477a806..cad2bd7 100755\n--- a/tests/qemu-iotests/162\n+++ b/tests/qemu-iotests/162\n@@ -28,13 +28,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- rm -f \"${TEST_DIR}/qemu-nbd.pid\"\n- rm -f 42\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170\nindex b79359f..5288a2d 100755\n--- a/tests/qemu-iotests/170\n+++ b/tests/qemu-iotests/170\n@@ -26,13 +26,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.out\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n . ./common.rc\n . ./common.filter\n . ./common.pattern\ndiff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171\nindex bcfaaf1..2798d2f 100755\n--- a/tests/qemu-iotests/171\n+++ b/tests/qemu-iotests/171\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172\nindex 826d6fe..125c1d9 100755\n--- a/tests/qemu-iotests/172\n+++ b/tests/qemu-iotests/172\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm -f \"$TEST_IMG.2\"\n- rm -f \"$TEST_IMG.3\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173\nindex bdaa092..0c2fde4 100755\n--- a/tests/qemu-iotests/173\n+++ b/tests/qemu-iotests/173\n@@ -27,13 +27,7 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_qemu\n- rm -f \"${QEMU_TEST_DIR}/image.base\" \"${QEMU_TEST_DIR}/image.snp1\"\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174\nindex 552879d..67cd785 100755\n--- a/tests/qemu-iotests/174\n+++ b/tests/qemu-iotests/174\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175\nindex ca56e82..1407597 100755\n--- a/tests/qemu-iotests/175\n+++ b/tests/qemu-iotests/175\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176\nindex 950b287..56cd490 100755\n--- a/tests/qemu-iotests/176\n+++ b/tests/qemu-iotests/176\n@@ -31,13 +31,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- _rm_test_img \"$TEST_IMG.itmd\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177\nindex f8ed8fb..ed2e8b2 100755\n--- a/tests/qemu-iotests/177\n+++ b/tests/qemu-iotests/177\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178\nindex 6af52c6..fd583d1 100755\n--- a/tests/qemu-iotests/178\n+++ b/tests/qemu-iotests/178\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.converted\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179\nindex 115944a..f7cf129 100755\n--- a/tests/qemu-iotests/179\n+++ b/tests/qemu-iotests/179\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=\"$PWD\"\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm -f \"$TEST_DIR/blkdebug.conf\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/181 b/tests/qemu-iotests/181\nindex 0333dda..8abc61a 100755\n--- a/tests/qemu-iotests/181\n+++ b/tests/qemu-iotests/181\n@@ -29,13 +29,7 @@ status=1\t# failure is the default!\n \n MIG_SOCKET=\"${TEST_DIR}/migrate\"\n \n-_cleanup()\n-{\n- rm -f \"${MIG_SOCKET}\"\n-\t_cleanup_test_img\n- _cleanup_qemu\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182\nindex 7ecbb22..a4cbb03 100755\n--- a/tests/qemu-iotests/182\n+++ b/tests/qemu-iotests/182\n@@ -28,12 +28,6 @@ here=\"$PWD\"\n tmp=/tmp/$$\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183\nindex 20268ff..2e09679 100755\n--- a/tests/qemu-iotests/183\n+++ b/tests/qemu-iotests/183\n@@ -29,14 +29,7 @@ status=1 # failure is the default!\n \n MIG_SOCKET=\"${TEST_DIR}/migrate\"\n \n-_cleanup()\n-{\n- rm -f \"${MIG_SOCKET}\"\n- rm -f \"${TEST_IMG}.dest\"\n- _cleanup_test_img\n- _cleanup_qemu\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185\nindex f5b47e4..7269d5e 100755\n--- a/tests/qemu-iotests/185\n+++ b/tests/qemu-iotests/185\n@@ -29,14 +29,7 @@ status=1 # failure is the default!\n \n MIG_SOCKET=\"${TEST_DIR}/migrate\"\n \n-_cleanup()\n-{\n- rm -f \"${TEST_IMG}.mid\"\n- rm -f \"${TEST_IMG}.copy\"\n- _cleanup_test_img\n- _cleanup_qemu\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n+trap \"_cleanup_qemu; exit \\$status\" 0 1 2 3 15\n \n # get standard environment, filters and checks\n . ./common.rc\ndiff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186\nindex 2b9f618..e301871 100755\n--- a/tests/qemu-iotests/186\n+++ b/tests/qemu-iotests/186\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187\nindex 7bb7833..8b29df3 100755\n--- a/tests/qemu-iotests/187\n+++ b/tests/qemu-iotests/187\n@@ -27,14 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n- rm -f \"$TEST_IMG.2\"\n- rm -f \"$TEST_IMG.3\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/188 b/tests/qemu-iotests/188\nindex 83ed03e..48f855d 100755\n--- a/tests/qemu-iotests/188\n+++ b/tests/qemu-iotests/188\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189\nindex e695475..c5d516d 100755\n--- a/tests/qemu-iotests/189\n+++ b/tests/qemu-iotests/189\n@@ -27,12 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190\nindex 8f808fe..84d20c6 100755\n--- a/tests/qemu-iotests/190\n+++ b/tests/qemu-iotests/190\n@@ -27,13 +27,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1 # failure is the default!\n \n-_cleanup()\n-{\n- _cleanup_test_img\n- rm -f \"$TEST_IMG.converted\"\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\ndiff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192\nindex b50a2c0..6a95b81 100755\n--- a/tests/qemu-iotests/192\n+++ b/tests/qemu-iotests/192\n@@ -28,12 +28,6 @@ echo \"QA output created by $seq\"\n here=`pwd`\n status=1\t# failure is the default!\n \n-_cleanup()\n-{\n-\t_cleanup_test_img\n-}\n-trap \"_cleanup; exit \\$status\" 0 1 2 3 15\n-\n # get standard environment, filters and checks\n . ./common.rc\n . ./common.filter\n", "prefixes": [ "v3", "2/5" ] }