From nobody Mon Feb 9 12:26:46 2026 Delivered-To: importer@patchew.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=1604247464; cv=none; d=zohomail.com; s=zohoarc; b=bVreGox7k/zfzJoFGhjCNTt+PRPRa5dn2CLOurYgpYN/bRP0Gj/9trXyI2P3yHFnsT7yaW2k89yueI9rstQEZbGHVcRXB96TWc+9rrF9WYF6dJz0AEsGNxBo9HIbe4E/VU1gzgFAnGu7T08nfe4BsB0rizX6LX7gN+RvYoAnnhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604247464; 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=ZsH6C6yhR4/WIsRbz4nkasXx3roTg46Lxsi9bJKtc7E=; b=BSuUzQLBujUccPdfm8xYdO9rucUIJW+vgxw1y7tnWOporJO8r1RT17TODMnipDt9Grk7ijorTQym29eVoztx2EKgHNjy4h22gDYyEPBDYjs/v2nbl2WQ66bY3oPX7gkOeRxb5CvsgK8o8lLhgo9II+SvBg5p4lSRci4MbP9NBAA= 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 1604247464134116.2818652916792; Sun, 1 Nov 2020 08:17:44 -0800 (PST) Received: from localhost ([::1]:33422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZG34-0006zL-Js for importer@patchew.org; Sun, 01 Nov 2020 11:17:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZG1J-0005tI-1I for qemu-devel@nongnu.org; Sun, 01 Nov 2020 11:15:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZG1D-0004T7-49 for qemu-devel@nongnu.org; Sun, 01 Nov 2020 11:15:51 -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-312-qGUm0qLBOU6HFvUdOf20mw-1; Sun, 01 Nov 2020 11:15:43 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89C5A802B72; Sun, 1 Nov 2020 16:15:42 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD93C5C1A3; Sun, 1 Nov 2020 16:15:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604247345; 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=ZsH6C6yhR4/WIsRbz4nkasXx3roTg46Lxsi9bJKtc7E=; b=KB1vVdAHcF3aTZGvT5X59YZt+8vvnRf4POjdxS2Dui5yE7HjnOb9cLvQAbkvgkuLaTwraQ 82t9ZFHl1KOrBAUzmjVWMtuQxaPj9pWpTuuivXJeRKAeu1dX0lBIJXJkvWA4Mx48G0Phq1 bKRIp9tf3+d9jttUvX2VW+EXlPX514w= X-MC-Unique: qGUm0qLBOU6HFvUdOf20mw-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] iotests: add filter_qmp_virtio_scsi function Date: Sun, 1 Nov 2020 18:15:31 +0200 Message-Id: <20201101161532.259609-2-mlevitsk@redhat.com> In-Reply-To: <20201101161532.259609-1-mlevitsk@redhat.com> References: <20201101161532.259609-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlevitsk@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/01 11:15:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Laurent Vivier , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini , Maxim Levitsky 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" filter_qmp_virtio_scsi can be used to filter virtio-scsi-pci/ccw difference= s. Note that this patch was only tested on x86. Suggested-by: Paolo Bonzini Signed-off-by: Maxim Levitsky --- tests/qemu-iotests/iotests.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 63d2ace93c..18b7437600 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -392,6 +392,16 @@ def filter_qmp_testfiles(qmsg): return value return filter_qmp(qmsg, _filter) =20 +def filter_virtio_scsi(output: str) -> str: + return re.sub(r'(virtio-scsi)-(ccw|pci)', r'\1', output) + +def filter_qmp_virtio_scsi(qmsg): + def _filter(_key, value): + if is_str(value): + return filter_virtio_scsi(value) + return value + return filter_qmp(qmsg, _filter) + def filter_generated_node_ids(msg): return re.sub("#block[0-9]+", "NODE_NAME", msg) =20 --=20 2.26.2