From nobody Thu Dec 18 22:19:06 2025 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=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583515653; cv=none; d=zohomail.com; s=zohoarc; b=LxdCNPRfX+lRHU0uOvEML4ZaHauIcTWdgl3fa9HHuD+TP4ug3MjI4++sof5PbL4e518qXO0NhQ9l3GuXTrd2a+ve8QMNb2e6zY1Bm07C1DYTrOacZ0Xu+5MLeVf+Nq40JD/E6cpdJu7AwbpYRNGZLIArPwNM5iUHuAg9PWwPGaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583515653; 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=hvR1SEgAX4EHwymKc6mgoUAURYh382YfZyHV5CLq2mk=; b=ep/U6IQctCgV3oGneiLeltgWgFzD8tLQc9tH+09euFc3eNMYdB24QJ7BvRugwOOag8w0g1N6KnW+MiYrH0OTjSHjFAvL3h8lQE4iPmIyGouQwlEwKbyJGkWX7F4FPpoQVAPLT6qc247Y1OZiHJUyqMzxHKHzXFLWHtBR4u4EbCI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 158351565355323.670972670676747; Fri, 6 Mar 2020 09:27:33 -0800 (PST) Received: from localhost ([::1]:39978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGl2-0006TB-Ir for importer@patchew.org; Fri, 06 Mar 2020 12:27:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49035) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGZi-0005K6-Pq for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGZh-0000Ba-7B for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:50 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37857 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 1jAGZg-000084-5q for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:49 -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-423-zA2JxtlLNtu2Jjj7hAv0Vw-1; Fri, 06 Mar 2020 12:15:45 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA29713F9; Fri, 6 Mar 2020 17:15:41 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4DE873873; Fri, 6 Mar 2020 17:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583514947; 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=hvR1SEgAX4EHwymKc6mgoUAURYh382YfZyHV5CLq2mk=; b=cuUKbp+UK+k9QogXKQhi0x1e5WqzjPLVhHqywiD234tnO9FK9HmzDjGJMJbbOUxm5+RHia oPlrt3LK9SgGNEtxHbbsrya3q32N1uC7tzILajbnx/VTE2m/EYUKKvBo3k20LiLCOCJJhP HGehr8vQO/vsmft9PPxmevll79Uq4Hg= X-MC-Unique: zA2JxtlLNtu2Jjj7hAv0Vw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 28/29] iotests: Refactor blockdev-reopen test for iothreads Date: Fri, 6 Mar 2020 18:14:57 +0100 Message-Id: <20200306171458.1848-29-kwolf@redhat.com> In-Reply-To: <20200306171458.1848-1-kwolf@redhat.com> References: <20200306171458.1848-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We'll want to test more than one successful case in the future, so prepare the test for that by a refactoring that runs each scenario in a separate VM. test_iothreads_switch_{backing,overlay} currently produce errors, but these are cases that should actually work, by switching either the backing file node or the overlay node to the AioContext of the other node. Signed-off-by: Kevin Wolf Tested-by: Peter Krempa Message-Id: <20200306141413.30705-2-kwolf@redhat.com> Signed-off-by: Kevin Wolf --- tests/qemu-iotests/245 | 47 ++++++++++++++++++++++++++++++-------- tests/qemu-iotests/245.out | 4 ++-- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/tests/qemu-iotests/245 b/tests/qemu-iotests/245 index 489bf78bd0..7d9eb6285c 100755 --- a/tests/qemu-iotests/245 +++ b/tests/qemu-iotests/245 @@ -970,8 +970,7 @@ class TestBlockdevReopen(iotests.QMPTestCase): self.assertEqual(self.get_node('hd1'), None) self.assert_qmp(self.get_node('hd2'), 'ro', True) =20 - # We don't allow setting a backing file that uses a different AioConte= xt - def test_iothreads(self): + def run_test_iothreads(self, iothread_a, iothread_b, errmsg =3D None): opts =3D hd_opts(0) result =3D self.vm.qmp('blockdev-add', conv_keys =3D False, **opts) self.assert_qmp(result, 'return', {}) @@ -986,20 +985,48 @@ class TestBlockdevReopen(iotests.QMPTestCase): result =3D self.vm.qmp('object-add', qom_type=3D'iothread', id=3D'= iothread1') self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('x-blockdev-set-iothread', node_name=3D'hd0= ', iothread=3D'iothread0') + result =3D self.vm.qmp('device_add', driver=3D'virtio-scsi', id=3D= 'scsi0', + iothread=3Diothread_a) self.assert_qmp(result, 'return', {}) =20 - self.reopen(opts, {'backing': 'hd2'}, "Cannot use a new backing fi= le with a different AioContext") - - result =3D self.vm.qmp('x-blockdev-set-iothread', node_name=3D'hd2= ', iothread=3D'iothread1') + result =3D self.vm.qmp('device_add', driver=3D'virtio-scsi', id=3D= 'scsi1', + iothread=3Diothread_b) self.assert_qmp(result, 'return', {}) =20 - self.reopen(opts, {'backing': 'hd2'}, "Cannot use a new backing fi= le with a different AioContext") + if iothread_a: + result =3D self.vm.qmp('device_add', driver=3D'scsi-hd', drive= =3D'hd0', + share_rw=3DTrue, bus=3D"scsi0.0") + self.assert_qmp(result, 'return', {}) =20 - result =3D self.vm.qmp('x-blockdev-set-iothread', node_name=3D'hd2= ', iothread=3D'iothread0') - self.assert_qmp(result, 'return', {}) + if iothread_b: + result =3D self.vm.qmp('device_add', driver=3D'scsi-hd', drive= =3D'hd2', + share_rw=3DTrue, bus=3D"scsi1.0") + self.assert_qmp(result, 'return', {}) =20 - self.reopen(opts, {'backing': 'hd2'}) + # Attaching the backing file may or may not work + self.reopen(opts, {'backing': 'hd2'}, errmsg) + + # But removing the backing file should always work + self.reopen(opts, {'backing': None}) + + self.vm.shutdown() + + # We don't allow setting a backing file that uses a different AioConte= xt if + # neither of them can switch to the other AioContext + def test_iothreads_error(self): + self.run_test_iothreads('iothread0', 'iothread1', + "Cannot use a new backing file with a diff= erent AioContext") + + def test_iothreads_compatible_users(self): + self.run_test_iothreads('iothread0', 'iothread0') + + def test_iothreads_switch_backing(self): + self.run_test_iothreads('iothread0', None, + "Cannot use a new backing file with a diff= erent AioContext") + + def test_iothreads_switch_overlay(self): + self.run_test_iothreads(None, 'iothread0', + "Cannot use a new backing file with a diff= erent AioContext") =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D["qcow2"], diff --git a/tests/qemu-iotests/245.out b/tests/qemu-iotests/245.out index a19de5214d..682b93394d 100644 --- a/tests/qemu-iotests/245.out +++ b/tests/qemu-iotests/245.out @@ -1,6 +1,6 @@ -.................. +..................... ---------------------------------------------------------------------- -Ran 18 tests +Ran 21 tests =20 OK {"execute": "job-finalize", "arguments": {"id": "commit0"}} --=20 2.20.1