Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812883/?format=api
{ "id": 812883, "url": "http://patchwork.ozlabs.org/api/patches/812883/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912144459.11359-8-pbonzini@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": "<20170912144459.11359-8-pbonzini@redhat.com>", "list_archive_url": null, "date": "2017-09-12T14:44:56", "name": "[07/10] qemu-iotests: disintegrate more parts of common.config", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c4a7eaf281560a268929c6cef5fecf4953e61dea", "submitter": { "id": 2701, "url": "http://patchwork.ozlabs.org/api/people/2701/?format=api", "name": "Paolo Bonzini", "email": "pbonzini@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912144459.11359-8-pbonzini@redhat.com/mbox/", "series": [ { "id": 2722, "url": "http://patchwork.ozlabs.org/api/series/2722/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2722", "date": "2017-09-12T14:44:51", "name": "cleanup qemu-iotests", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/2722/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812883/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812883/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=pbonzini@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 3xs70d1HWkz9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 00:46:41 +1000 (AEST)", "from localhost ([::1]:36311 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 1drmSV-0004NA-71\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 10:46:39 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:51862)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <pbonzini@redhat.com>) id 1drmRP-00040b-VO\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 10:45:33 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <pbonzini@redhat.com>) id 1drmRO-0001ul-P6\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 10:45:32 -0400", "from mx1.redhat.com ([209.132.183.28]:25239)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <pbonzini@redhat.com>)\n\tid 1drmRI-0001rV-4S; Tue, 12 Sep 2017 10:45:24 -0400", "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\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 1D5BB4A6E9;\n\tTue, 12 Sep 2017 14:45:23 +0000 (UTC)", "from donizetti.redhat.com (ovpn-117-43.ams2.redhat.com\n\t[10.36.117.43])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id DC5DF6FA84;\n\tTue, 12 Sep 2017 14:45:20 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 1D5BB4A6E9", "From": "Paolo Bonzini <pbonzini@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 16:44:56 +0200", "Message-Id": "<20170912144459.11359-8-pbonzini@redhat.com>", "In-Reply-To": "<20170912144459.11359-1-pbonzini@redhat.com>", "References": "<20170912144459.11359-1-pbonzini@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tTue, 12 Sep 2017 14:45:23 +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 07/10] qemu-iotests: disintegrate more parts of\n\tcommon.config", "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", "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": "Split \"check\" parts from tests part.\n\nFor the directory setup, the actual computation of directories goes\nin \"check\", while the sanity checks go in the tests.\n\nSigned-off-by: Paolo Bonzini <pbonzini@redhat.com>\n---\n tests/qemu-iotests/common | 24 ++++++++++++++++++++\n tests/qemu-iotests/common.config | 49 ----------------------------------------\n tests/qemu-iotests/common.qemu | 1 +\n tests/qemu-iotests/common.rc | 25 ++++++++++++++++++++\n 4 files changed, 50 insertions(+), 49 deletions(-)", "diff": "diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common\nindex abacc24114..ee313af92f 100644\n--- a/tests/qemu-iotests/common\n+++ b/tests/qemu-iotests/common\n@@ -48,6 +48,14 @@ set_prog_path()\n fi\n }\n \n+if [ -z \"$TEST_DIR\" ]; then\n+ TEST_DIR=`pwd`/scratch\n+fi\n+\n+if [ ! -e \"$TEST_DIR\" ]; then\n+ mkdir \"$TEST_DIR\"\n+fi\n+\n diff=\"diff -u\"\n verbose=false\n debug=false\n@@ -440,6 +448,13 @@ if [ \"$IMGFMT\" == \"luks\" ] && ! (echo \"$IMGOPTS\" | grep \"iter-time=\" > /dev/null\n IMGOPTS=$(_optstr_add \"$IMGOPTS\" \"iter-time=10\")\n fi\n \n+if [ -z \"$SAMPLE_IMG_DIR\" ]; then\n+ SAMPLE_IMG_DIR=\"$source_iotests/sample_images\"\n+fi\n+\n+export TEST_DIR\n+export SAMPLE_IMG_DIR\n+\n if [ -s $tmp.list ]\n then\n # found some valid test numbers ... this is good\n@@ -524,3 +539,12 @@ if [ -x \"$build_iotests/socket_scm_helper\" ]\n then\n export SOCKET_SCM_HELPER=\"$build_iotests/socket_scm_helper\"\n fi\n+\n+default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')\n+default_alias_machine=$($QEMU_PROG -machine help | \\\n+ sed -n \"/(alias of $default_machine)/ { s/ .*//p; q; }\")\n+if [[ \"$default_alias_machine\" ]]; then\n+ default_machine=\"$default_alias_machine\"\n+fi\n+\n+export QEMU_DEFAULT_MACHINE=\"$default_machine\"\ndiff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config\nindex c7f0a7a7e0..cdcda54546 100644\n--- a/tests/qemu-iotests/common.config\n+++ b/tests/qemu-iotests/common.config\n@@ -26,8 +26,6 @@ arch=`uname -m`\n \n export PWD=`pwd`\n \n-export _QEMU_HANDLE=0\n-\n # make sure we have a standard umask\n umask 022\n \n@@ -40,52 +38,5 @@ _optstr_add()\n fi\n }\n \n-QEMU_IMG_EXTRA_ARGS=\n-if [ \"$IMGOPTSSYNTAX\" = \"true\" ]; then\n- QEMU_IMG_EXTRA_ARGS=\"--image-opts $QEMU_IMG_EXTRA_ARGS\"\n- if [ -n \"$IMGKEYSECRET\" ]; then\n- QEMU_IMG_EXTRA_ARGS=\"--object secret,id=keysec0,data=$IMGKEYSECRET $QEMU_IMG_EXTRA_ARGS\"\n- fi\n-fi\n-export QEMU_IMG_EXTRA_ARGS\n-\n-\n-default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')\n-default_alias_machine=$($QEMU_PROG -machine help | \\\n- sed -n \"/(alias of $default_machine)/ { s/ .*//p; q; }\")\n-if [[ \"$default_alias_machine\" ]]; then\n- default_machine=\"$default_alias_machine\"\n-fi\n-\n-export QEMU_DEFAULT_MACHINE=\"$default_machine\"\n-\n-if [ -z \"$TEST_DIR\" ]; then\n- TEST_DIR=`pwd`/scratch\n-fi\n-\n-QEMU_TEST_DIR=\"${TEST_DIR}\"\n-\n-if [ ! -e \"$TEST_DIR\" ]; then\n- mkdir \"$TEST_DIR\"\n-fi\n-\n-if [ ! -d \"$TEST_DIR\" ]; then\n- echo \"common.config: Error: \\$TEST_DIR ($TEST_DIR) is not a directory\"\n- exit 1\n-fi\n-\n-export TEST_DIR\n-\n-if [ -z \"$SAMPLE_IMG_DIR\" ]; then\n- SAMPLE_IMG_DIR=\"$source_iotests/sample_images\"\n-fi\n-\n-if [ ! -d \"$SAMPLE_IMG_DIR\" ]; then\n- echo \"common.config: Error: \\$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory\"\n- exit 1\n-fi\n-\n-export SAMPLE_IMG_DIR\n-\n # make sure this script returns success\n true\ndiff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu\nindex 7645f1dc72..9f9aecc9df 100644\n--- a/tests/qemu-iotests/common.qemu\n+++ b/tests/qemu-iotests/common.qemu\n@@ -31,6 +31,7 @@ QEMU_FIFO_IN=\"${QEMU_TEST_DIR}/qmp-in-$$\"\n QEMU_FIFO_OUT=\"${QEMU_TEST_DIR}/qmp-out-$$\"\n \n QEMU_HANDLE=0\n+export _QEMU_HANDLE=0\n \n # If bash version is >= 4.1, these will be overwritten and dynamic\n # file descriptor values assigned.\ndiff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc\nindex 20f6821a69..f4dc0104e6 100644\n--- a/tests/qemu-iotests/common.rc\n+++ b/tests/qemu-iotests/common.rc\n@@ -114,6 +114,10 @@ export QEMU_VXHS=_qemu_vxhs_wrapper\n \n if [ \"$IMGOPTSSYNTAX\" = \"true\" ]; then\n DRIVER=\"driver=$IMGFMT\"\n+ QEMU_IMG_EXTRA_ARGS=\"--image-opts $QEMU_IMG_EXTRA_ARGS\"\n+ if [ -n \"$IMGKEYSECRET\" ]; then\n+ QEMU_IMG_EXTRA_ARGS=\"--object secret,id=keysec0,data=$IMGKEYSECRET $QEMU_IMG_EXTRA_ARGS\"\n+ fi\n if [ \"$IMGFMT\" = \"luks\" ]; then\n DRIVER=\"$DRIVER,key-secret=keysec0\"\n fi\n@@ -133,6 +137,7 @@ if [ \"$IMGOPTSSYNTAX\" = \"true\" ]; then\n TEST_IMG=\"$DRIVER,file.driver=$IMGPROTO,file.filename=$TEST_DIR/t.$IMGFMT\"\n fi\n else\n+ QEMU_IMG_EXTRA_ARGS=\n if [ \"$IMGPROTO\" = \"file\" ]; then\n TEST_IMG=$TEST_DIR/t.$IMGFMT\n elif [ \"$IMGPROTO\" = \"nbd\" ]; then\n@@ -153,6 +158,26 @@ else\n fi\n ORIG_TEST_IMG=\"$TEST_IMG\"\n \n+if [ -z \"$TEST_DIR\" ]; then\n+ TEST_DIR=`pwd`/scratch\n+fi\n+\n+QEMU_TEST_DIR=\"${TEST_DIR}\"\n+\n+if [ ! -e \"$TEST_DIR\" ]; then\n+ mkdir \"$TEST_DIR\"\n+fi\n+\n+if [ ! -d \"$TEST_DIR\" ]; then\n+ echo \"common.config: Error: \\$TEST_DIR ($TEST_DIR) is not a directory\"\n+ exit 1\n+fi\n+\n+if [ ! -d \"$SAMPLE_IMG_DIR\" ]; then\n+ echo \"common.config: Error: \\$SAMPLE_IMG_DIR ($SAMPLE_IMG_DIR) is not a directory\"\n+ exit 1\n+fi\n+\n _use_sample_img()\n {\n SAMPLE_IMG_FILE=\"${1%\\.bz2}\"\n", "prefixes": [ "07/10" ] }