From nobody Sun Feb 8 16:11:54 2026 Delivered-To: importer@patchew.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=1659935220; cv=none; d=zohomail.com; s=zohoarc; b=Ud48YKhaGnlEyn55u/D1XBVmroh3epHG78oVTtc0e3ZCxDJxlY91mPKXmWM+1A/oSYTg8Teh3s3EDlK7x+fobA5dJRAWpvEsvDQUam/tSPjUdq4k3AniFt5Y9cHsmIkOM4DZDtD71+uiNMU7E+oqqEqJ9gIx4eGlOuYIYoCPebk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659935220; h=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=Zmj30+CXON8xCJp3OWQkxjilFKmifFXx8ZQSpn/6NV4=; b=TFE+JDjYinCsmZ+FU7SL+vDF9x5pUqxQPXu2yTO1tuYcpyZFd7pQqkuKGqcv6Oe/mJU3ow3iVfFcGDbHmgDORT3gkCvTWSMw6iq/BN59Je6fxLG0/SNOcwdLVEzjGOZwNVRYyjEgdQpNgLiOeJuQos/RmW64IbFwlZ2EQ1ahZGk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659935220942850.8914084334508; Sun, 7 Aug 2022 22:07:00 -0700 (PDT) Received: from localhost ([::1]:47690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKuyf-0005Ny-Ln for importer@patchew.org; Mon, 08 Aug 2022 01:06:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxE-0003b5-Ah for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxC-0001LS-Hf for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:28 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-529-eo61kUTaPu-DFLpEMhaXdw-1; Mon, 08 Aug 2022 01:05:20 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7BC380391B; Mon, 8 Aug 2022 05:05:19 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id F163C492C3B; Mon, 8 Aug 2022 05:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659935125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zmj30+CXON8xCJp3OWQkxjilFKmifFXx8ZQSpn/6NV4=; b=Vd+u8elR6U1aqzT5cvOUXPn1S7PsHgg6iHB0MosCV3wSeU7eAmkKyQVUKDqOGCRuN19rQ8 5wOpWVG3oDbNcZaeXT22i8rl/rG9ya/OIW5vR8Xj5HwumXpb8Y4joaAwekzTwyITCoQhR0 RLU8dXaWkHuf4lERGi4TxN9snF7h1/w= X-MC-Unique: eo61kUTaPu-DFLpEMhaXdw-1 From: Thomas Huth To: Richard Henderson , qemu-devel@nongnu.org Cc: Pavel Dovgalyuk Subject: [PULL 1/4] pc-bios/s390-ccw: Fix booting with logical block size < physical block size Date: Mon, 8 Aug 2022 07:05:12 +0200 Message-Id: <20220808050515.1283174-2-thuth@redhat.com> In-Reply-To: <20220808050515.1283174-1-thuth@redhat.com> References: <20220808050515.1283174-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659935223102100002 Content-Type: text/plain; charset="utf-8" For accessing single blocks during boot, it's the logical block size that matters. (Physical block sizes are rather interesting e.g. for creating file systems with the correct alignment for speed reasons etc.). So the s390-ccw bios has to use the logical block size for calculating sector numbers during the boot phase, the "physical_block_exp" shift value must not be taken into account. This change fixes the boot process when the guest hast been installed on a disk where the logical block size differs from the physical one, e.g. if the guest has been installed like this: qemu-system-s390x -nographic -accel kvm -m 2G \ -drive if=3Dnone,id=3Dd1,file=3Dfedora.iso,format=3Draw,media=3Dcdrom \ -device virtio-scsi -device scsi-cd,drive=3Dd1 \ -drive if=3Dnone,id=3Dd2,file=3Dtest.qcow2,format=3Dqcow2 -device virtio-blk,drive=3Dd2,physical_block_size=3D4096,logical_block_si= ze=3D512 Linux correctly uses the logical block size of 512 for the installation, but the s390-ccw bios tries to boot from a disk with 4096 block size so far, as long as this patch has not been applied yet (well, it used to work by accident in the past due to the virtio_assume_scsi() hack that used to enforce 512 byte sectors on all virtio-block disks, but that hack has been well removed in commit 5447de2619050a0a4d to fix other scenarios). Fixes: 5447de2619 ("pc-bios/s390-ccw/virtio-blkdev: Remove virtio_assume_sc= si()") Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D2112303 Message-Id: <20220805094214.285223-1-thuth@redhat.com> Reviewed-by: Cornelia Huck Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/virtio-blkdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blk= dev.c index 8271c47296..794f99b42c 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -173,7 +173,7 @@ int virtio_get_block_size(void) =20 switch (vdev->senseid.cu_model) { case VIRTIO_ID_BLOCK: - return vdev->config.blk.blk_size << vdev->config.blk.physical_bloc= k_exp; + return vdev->config.blk.blk_size; case VIRTIO_ID_SCSI: return vdev->scsi_block_size; } --=20 2.31.1 From nobody Sun Feb 8 16:11:54 2026 Delivered-To: importer@patchew.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=1659935408; cv=none; d=zohomail.com; s=zohoarc; b=ieIfNV9IPkHwKEN6yyiz/o+f5agOUMlbJqNKITgOUOemaClvSZE3mILHFjD9agSyN7nG+FyQp8Nx3yHGf5rpH237DZ7XizDBBMC5E8qBYaWTu6qh2xbGoj2YeVdKZmkdNwrKLch0FCdGjVt30YBoEzj+UMsTVutGWAKXwtm/MTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659935408; h=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=mwfbe2I5gLgUm6skWeR9CbsotMHUiuAl3iYC3+xLuA8=; b=AedhNE6/0a531orcuxiEX8dUH/6AZb6F8JXaHf7NHwr2K5SER/ZUZIgt10Eg545/W5dSjEIygQ3tZXkj/LaEVgMfDsnH3rfW+AU329esTuJ/vSUTSlFGyWwergI2tYYZhmoLx+ljkl2wsotaFljr8QNdK0dHBVNyfeP5OmAY/GA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659935408275745.3551414588562; Sun, 7 Aug 2022 22:10:08 -0700 (PDT) Received: from localhost ([::1]:53358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKv1j-0000ot-9w for importer@patchew.org; Mon, 08 Aug 2022 01:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxJ-0003gc-VD for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxE-0001Lj-My for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-411-CSQCO3VRNKq80M4so5jEYQ-1; Mon, 08 Aug 2022 01:05:21 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 509D985A58B; Mon, 8 Aug 2022 05:05:21 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47B15492C3B; Mon, 8 Aug 2022 05:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659935128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mwfbe2I5gLgUm6skWeR9CbsotMHUiuAl3iYC3+xLuA8=; b=b0tEzhK2iBjtoBTeGTYUfsa29Qs1KGF4xoZDhMOOzlP7DWhDdEqrMysf1+wCAEm3CJJ8CC 8Wshrxh/TDEpMyXIux1qE978ZZYXCuSQXK61U7VI3e4dJHwUqNyZwQXc58beSMx9X07lkE qEsdW8iMAovoeYv9vHDJl6DO6F67SLQ= X-MC-Unique: CSQCO3VRNKq80M4so5jEYQ-1 From: Thomas Huth To: Richard Henderson , qemu-devel@nongnu.org Cc: Pavel Dovgalyuk Subject: [PULL 2/4] pc-bios/s390-ccw: Update the s390-ccw.img with the block size fix Date: Mon, 8 Aug 2022 07:05:13 +0200 Message-Id: <20220808050515.1283174-3-thuth@redhat.com> In-Reply-To: <20220808050515.1283174-1-thuth@redhat.com> References: <20220808050515.1283174-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659935409709100002 Content-Type: text/plain; charset="utf-8" The new binary now gets the block size of virtio-blk devices right. Signed-off-by: Thomas Huth --- pc-bios/s390-ccw.img | Bin 42608 -> 42608 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pc-bios/s390-ccw.img b/pc-bios/s390-ccw.img index 39f9680a0ef1c57f8a0bac9e12ff77ce15150d37..554fcbd1b7af8ea5f8f0d887fba= 98d52b7a8611d 100644 GIT binary patch delta 4206 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 (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659935272211683.8523095985253; Sun, 7 Aug 2022 22:07:52 -0700 (PDT) Received: from localhost ([::1]:48782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKuzX-00066M-6W for importer@patchew.org; Mon, 08 Aug 2022 01:07:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxW-00047E-Px for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxV-0001Me-BN for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:46 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-461-6wehF78uO1af6bAnFiXsIQ-1; Mon, 08 Aug 2022 01:05:22 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B9F9802D1C; Mon, 8 Aug 2022 05:05:22 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3762492C3B; Mon, 8 Aug 2022 05:05:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659935144; 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=KK8q6yFnKqoNZZsWA+N+R+/sEUtZIDcPe31pRheLg/U=; b=JC73ljiiHBcegVaArybI/QHOiLSY72WmKuAeYKNkX2fSZBxomSGSGZUYTqj/+ix9/rFyz5 AnKjeW7jNN9eP4R6DuZPFLz5mxxcI4uXXeJ6KAOQXunlmBmL2m8dRSjYHR9zUcof0tJrJj K0wLDwDyKwhMjSndxGUoN+ikhAtGt14= X-MC-Unique: 6wehF78uO1af6bAnFiXsIQ-1 From: Thomas Huth To: Richard Henderson , qemu-devel@nongnu.org Cc: Pavel Dovgalyuk Subject: [PULL 3/4] tests/avocado: fix replay-linux test Date: Mon, 8 Aug 2022 07:05:14 +0200 Message-Id: <20220808050515.1283174-4-thuth@redhat.com> In-Reply-To: <20220808050515.1283174-1-thuth@redhat.com> References: <20220808050515.1283174-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659935272981100001 From: Pavel Dovgalyuk Last line of the test is missing by accident. This patch fixes the script. Signed-off-by: Pavel Dovgalyuk Message-Id: <165943656662.362178.2086588841425038338.stgit@pasha-ThinkPad-X= 280> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- tests/avocado/replay_linux.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/avocado/replay_linux.py b/tests/avocado/replay_linux.py index 40e4f6908e..e1f9981a34 100644 --- a/tests/avocado/replay_linux.py +++ b/tests/avocado/replay_linux.py @@ -189,3 +189,4 @@ def test_virt_gicv3(self): =20 self.run_rr(shift=3D3, args=3D(*self.get_common_args(), + "-machine", "virt,gic-version=3D3")) --=20 2.31.1 From nobody Sun Feb 8 16:11:54 2026 Delivered-To: importer@patchew.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=1659935408; cv=none; d=zohomail.com; s=zohoarc; b=hDdB+kOglSARHfKnB/c8y55Um95QLpPLDjyZxXd2UL+TcFE3w16mGM0xYLxt5k9LVfl2XjAidslcTQ1f6B8VjpcPpgzEuU1IgPIMY4eFm2MyBTwIPVJGBn4e81De5Enc5dRRIeSCoICT/UE5YK4G/6orOLcAttryklBjRlLJS1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659935408; h=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=f+jhOkq3hrSIhvRLwA/PWHMbkUUOtTouzbkSy+8rsMc=; b=H1gF11Zmv20mPNO1eJSqUJervYHDRaqQ95D0bRn+pI/Ey3D74nSimmmpf7xEzrLfMvb+ZoXboCtf6sLGleY/TGJFffgnlEYW8bXO15nBGqwU/GjlYs37sppj7h2sKQ0hHr5wwCoDdGHCpQNrxYqYvk53h3HlwWd5xaCmthhQgJ0= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659935408678403.7604129330434; Sun, 7 Aug 2022 22:10:08 -0700 (PDT) Received: from localhost ([::1]:53362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKv1j-0000oz-Mk for importer@patchew.org; Mon, 08 Aug 2022 01:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxJ-0003gb-JH for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKuxG-0001Lq-AR for qemu-devel@nongnu.org; Mon, 08 Aug 2022 01:05:31 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-118-yaHeOcriORyXacv-8HjP3A-1; Mon, 08 Aug 2022 01:05:24 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D0EDD1019C8D; Mon, 8 Aug 2022 05:05:23 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5AB3492C3B; Mon, 8 Aug 2022 05:05:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659935129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f+jhOkq3hrSIhvRLwA/PWHMbkUUOtTouzbkSy+8rsMc=; b=L7X8xU4HpZQFdz3h/bUKiFHL2WvROctVYkWgoY8z8laStjTb2LIy2rdZXYJPZTqQ3SqRwE WJ+zo1PoiZyZ/8A7Y4FKjNQyKlqzCtz2kO6IaYdc6cjEPI76t+/4kxPaSfLEHlUC5jRv2E +WZ8RfjeXWeZ/gw5cT7ZGols63aTlpw= X-MC-Unique: yaHeOcriORyXacv-8HjP3A-1 From: Thomas Huth To: Richard Henderson , qemu-devel@nongnu.org Cc: Pavel Dovgalyuk Subject: [PULL 4/4] tests/qemu-iotests/264: Allow up to 5s for the BLOCK_JOB_CANCEL event to arrive Date: Mon, 8 Aug 2022 07:05:15 +0200 Message-Id: <20220808050515.1283174-5-thuth@redhat.com> In-Reply-To: <20220808050515.1283174-1-thuth@redhat.com> References: <20220808050515.1283174-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659935409709100001 Content-Type: text/plain; charset="utf-8" It is possible to hit the assertTrue(delta_t < 2.0) on very loaded systems. Increase the value to 5.0 to ease the situation a little bit. Message-Id: <20220802123101.430757-1-thuth@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Thomas Huth --- tests/qemu-iotests/264 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index bc431d1a19..289381e315 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -101,7 +101,7 @@ class TestNbdReconnect(iotests.QMPTestCase): start_t =3D time.time() self.vm.event_wait('BLOCK_JOB_CANCELLED') delta_t =3D time.time() - start_t - self.assertTrue(delta_t < 2.0) + self.assertTrue(delta_t < 5.0) =20 def test_mirror_cancel(self): # Mirror speed limit doesn't work well enough, it seems that mirror --=20 2.31.1