From nobody Mon May 6 11:41:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576666233; cv=none; d=zohomail.com; s=zohoarc; b=UaRuE8bnYD6bswl2oexmPf9ghdSyOOr6Q92zceLJZH+HKuvQc6J0ZqEMprTokw4fXpV1O2V2y1kGyK7KRk5a6gurNshfYUlRGIlfmuLp9eCqQVMNihkuSFIxE4pLh7lCYqlf9KBNkl4ApHyOIpVlxKNrdEK4j0Enbccxk/tqcsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576666233; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4Gqvng08FOpstnkGhLB5kE/YnUntbiNALGDnHLmboYM=; b=JITvBeJtOuEyHIxgn0+ARnYJOwFCmQnLZGbeiGri75G435qqM3Q8qtqLZYS3nqDJpi4cBxsLGVALmr78MF+HFvwMa3URMmNZTpUXpW1Fyfda5+lT7Kll52DwijdrrXzzrzrCRl/2uTnSavn0ne4ZoVcTz1AReVXoNcwe5zdMKTQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576666233774163.99091254886378; Wed, 18 Dec 2019 02:50:33 -0800 (PST) Received: from localhost ([::1]:52378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWuW-00083M-AP for importer@patchew.org; Wed, 18 Dec 2019 05:50:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38020) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWt6-0006dV-3k for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWt4-00006G-Vv for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55666 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWt4-00004t-RK for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:02 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-165-q4SdjB4YOe-s5jZ1wQh8ag-1; Wed, 18 Dec 2019 05:49:01 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 20785477; Wed, 18 Dec 2019 10:49:00 +0000 (UTC) Received: from localhost (ovpn-205-177.brq.redhat.com [10.40.205.177]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AD33726DC6; Wed, 18 Dec 2019 10:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576666142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4Gqvng08FOpstnkGhLB5kE/YnUntbiNALGDnHLmboYM=; b=CPIX8gai7uCWAw5ddm7gZtI6O10uYHhNe9uExGQn9mVmUsvv3cqq6zs/2vGUMGnnnw8D2q y9qmOmVJyVdRi4DozwQEujkF8JRziLy0gcvMqwsM3AJAkPaaIwzzRxzJsaZdGCXnVdZHg8 s+Z4I6iRx+QUJmt8nCnk6tiAxch6FJY= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 1/2] iotests/273: Filter format-specific information Date: Wed, 18 Dec 2019 11:48:54 +0100 Message-Id: <20191218104855.42566-2-mreitz@redhat.com> In-Reply-To: <20191218104855.42566-1-mreitz@redhat.com> References: <20191218104855.42566-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: q4SdjB4YOe-s5jZ1wQh8ag-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Doing this allows running this test with e.g. -o compat=3D0.10 or -o compat=3Drefcount_bits=3D1. Signed-off-by: Max Reitz --- tests/qemu-iotests/273 | 3 ++- tests/qemu-iotests/273.out | 27 --------------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273 index c355e9af47..00ff79bcf8 100755 --- a/tests/qemu-iotests/273 +++ b/tests/qemu-iotests/273 @@ -51,7 +51,8 @@ do_run_qemu() run_qemu() { do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp | - _filter_generated_node_ids | _filter_imgfmt | _filter_actual_image= _size + _filter_generated_node_ids | _filter_imgfmt | + _filter_actual_image_size | _filter_img_info } =20 TEST_IMG=3D"$TEST_IMG.base" _make_test_img 64M diff --git a/tests/qemu-iotests/273.out b/tests/qemu-iotests/273.out index c410fee5c4..684b8d6f77 100644 --- a/tests/qemu-iotests/273.out +++ b/tests/qemu-iotests/273.out @@ -38,15 +38,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTEST= _DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.base", "backing-filename": "TEST_DIR/t.IMGFMT.base", "dirty-flag": false @@ -57,15 +48,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTEST= _DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.mid", "backing-filename": "TEST_DIR/t.IMGFMT.mid", "dirty-flag": false @@ -136,15 +118,6 @@ Testing: -blockdev file,node-name=3Dbase,filename=3DTE= ST_DIR/t.IMGFMT.base -blockdev "cluster-size": 65536, "format": "IMGFMT", "actual-size": SIZE, - "format-specific": { - "type": "IMGFMT", - "data": { - "compat": "1.1", - "lazy-refcounts": false, - "refcount-bits": 16, - "corrupt": false - } - }, "full-backing-filename": "TEST_DIR/t.IMGFMT.base", "backing-filename": "TEST_DIR/t.IMGFMT.base", "dirty-flag": false --=20 2.23.0 From nobody Mon May 6 11:41:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576666238; cv=none; d=zohomail.com; s=zohoarc; b=d50x2kKalgVhMDuD7Xoz3Wm7QGcPZDoxOk/3qFVAtK5bmPEW12E7aXGHqc5hsL1UWBoaLQnHnWFvFTtfbcPVUMQ3o9SjT/tx+O63q69IkHS2ai2RTf13qiz+wETYMX3KQb+dhW6rx5H4KXexfC5YjsZC5Cpo/fAWLOXyJZF95fs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576666238; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NQ8blW1zn3dXW9hfEFpcNE5wS+a4gWHTkFia3wL65/w=; b=Iewb7hfvT0zO5ja3W75J1rlpoYNto/jtG6b+y5iSfsjKGLLTVjVk26bFBgFTN141dvX2F67qrWVdKfw4PxhwWx0EnHSa5AIuwoM3G+PHmvXTim1Jgs3uqhSQ769pARxDgnuN2ci5lkdjk/QF9dJONOikXHUr105K/3HTvM9gEsA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576666238046441.69601688368766; Wed, 18 Dec 2019 02:50:38 -0800 (PST) Received: from localhost ([::1]:52380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWua-00089h-AH for importer@patchew.org; Wed, 18 Dec 2019 05:50:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38933) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihWtA-0006iN-4C for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihWt8-0000Mp-RW for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:08 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60181 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihWt8-0000LQ-NS for qemu-devel@nongnu.org; Wed, 18 Dec 2019 05:49:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-382-Qg5KZFqLMB66xzHr8O1D5w-1; Wed, 18 Dec 2019 05:49:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E77ADB61; Wed, 18 Dec 2019 10:49:02 +0000 (UTC) Received: from localhost (ovpn-205-177.brq.redhat.com [10.40.205.177]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05E225D9E2; Wed, 18 Dec 2019 10:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576666146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NQ8blW1zn3dXW9hfEFpcNE5wS+a4gWHTkFia3wL65/w=; b=VwY3csBf0wdrynaq8GGmIRYBQay9VYv7o+bTf4bARgGuCsRQTkWFGy5Fau8vp6+9MyPJMp vmaUJDBV01rCiEc2zZaFytM8gSGUZd4prQTVSwUiNFNfon9kYFjSnZSgFkr4s4h+nV8s/Y 0iEGTD7PNakXWFzBqeKegqacYl9JALE= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 2/2] iotests: Fix IMGOPTSSYNTAX for nbd Date: Wed, 18 Dec 2019 11:48:55 +0100 Message-Id: <20191218104855.42566-3-mreitz@redhat.com> In-Reply-To: <20191218104855.42566-1-mreitz@redhat.com> References: <20191218104855.42566-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: Qg5KZFqLMB66xzHr8O1D5w-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" There is no $SOCKDIR, only $SOCK_DIR. Fixes: f3923a72f199b2c63747a7032db74730546f55c6 Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/qemu-iotests/common.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index ffb47c3d5c..d088392ab6 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -217,7 +217,8 @@ if [ "$IMGOPTSSYNTAX" =3D "true" ]; then TEST_IMG=3D"$DRIVER,file.filename=3D$TEST_DIR/t.$IMGFMT" elif [ "$IMGPROTO" =3D "nbd" ]; then TEST_IMG_FILE=3D$TEST_DIR/t.$IMGFMT - TEST_IMG=3D"$DRIVER,file.driver=3Dnbd,file.type=3Dunix,file.path= =3D$SOCKDIR/nbd" + TEST_IMG=3D"$DRIVER,file.driver=3Dnbd,file.type=3Dunix" + TEST_IMG=3D"$TEST_IMG,file.path=3D$SOCK_DIR/nbd" elif [ "$IMGPROTO" =3D "ssh" ]; then TEST_IMG_FILE=3D$TEST_DIR/t.$IMGFMT TEST_IMG=3D"$DRIVER,file.driver=3Dssh,file.host=3D127.0.0.1,file.p= ath=3D$TEST_IMG_FILE" --=20 2.23.0