From nobody Sat Nov 23 22:44:28 2024 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=1729689636; cv=none; d=zohomail.com; s=zohoarc; b=ncL1ZtDfusKUx6ZeElPDgYtAJurfPDKz2B1SRGTrEL0b60Tu3Z2UAhCD0OvKdWAHIUIGqjHuVB42iB1tESBTDpIS9WOH2fPuMHyFaIAVy0OdaSNLZS+S3OC+yCr3jme8t6SNO6O/wxV+8njU5jn4Ff+bS7oEIfy/uagUaZUzVeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729689636; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=o7Xdq2MTkGp0eGQVrGv94zTNIl5BzH+CbbEPfqGYkj4=; b=GWPRMMTM6Zj0wE2QupGpNod40T+asxt8jXjqO6BvudEwEPz4A8xKB2nYnDpsXHbGCkwxHugjzYVFrettOAbmMWp22vo5hq32iOQ/9SmLZvWiBQZjDBO7W46OBTGy5XzTMnFtwWCFpa/o/BrO8lhxAaVkIu/ay1goOjJuBwx5MPM= 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 172968963600870.83367927631946; Wed, 23 Oct 2024 06:20:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3bG1-0007je-S7; Wed, 23 Oct 2024 09:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3bFf-0007Ma-HU for qemu-devel@nongnu.org; Wed, 23 Oct 2024 09:18:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3bFc-0002FW-Md for qemu-devel@nongnu.org; Wed, 23 Oct 2024 09:18:14 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-520-FRd9asa-O7evNAu_366XBw-1; Wed, 23 Oct 2024 09:18:10 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB6B51955BE1; Wed, 23 Oct 2024 13:18:02 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.43]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E570819560AE; Wed, 23 Oct 2024 13:18:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729689491; 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=o7Xdq2MTkGp0eGQVrGv94zTNIl5BzH+CbbEPfqGYkj4=; b=Xzxmcbc4k+BRbLELmeR0p2tm3rR1qe6SAnJHsfz1WloDFoDRBOOSgBGzdYekjAbgAtySYj 6XirLf8soOMgcIFS2UflF27AOeh0mJo1/AL5I+a4pH+PSWRKMc9O7b/f0mGCz4Eb4XlaQU g5z5ITDT2p0u0zWVCVvqipAh2uxQmfU= X-MC-Unique: FRd9asa-O7evNAu_366XBw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Peter Maydell , Jared Rossi Subject: [PULL 19/23] tests/qtest: Add s390x boot order tests to cdrom-test.c Date: Wed, 23 Oct 2024 15:17:06 +0200 Message-ID: <20241023131710.906748-20-thuth@redhat.com> In-Reply-To: <20241023131710.906748-1-thuth@redhat.com> References: <20241023131710.906748-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 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: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.263, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729689636833116600 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Add two new qtests to verify that a valid IPL device can successfully boot = after failed IPL attempts from one or more invalid devices. cdrom-test/as-fallback-device: Defines the primary boot target as a device = that is invalid for IPL and a second boot target that is valid for IPL. Ensures = that the valid device will be selected after the initial failed IPL. cdrom-test/as-last-option: Defines the maximum number of boot devices (8) where only the final entry in the boot order is valid. Ensures that a valid device will be selected even after multiple failed IPL attempts from both virtio-blk and virtio-scsi device types. Signed-off-by: Jared Rossi Reviewed-by: Thomas Huth Message-ID: <20241020012953.1380075-20-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- tests/qtest/cdrom-test.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index 9d72b24e4b..c86725a511 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -213,6 +213,30 @@ static void add_s390x_tests(void) "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd1 " "-device virtio-blk,drive=3Dd2,bootindex=3D1 " "-drive if=3Dnone,id=3Dd2,media=3Dcdrom,file=3D", = test_cdboot); + qtest_add_data_func("cdrom/boot/as-fallback-device", + "-device virtio-serial -device virtio-scsi " + "-device virtio-blk,drive=3Dd1,bootindex=3D1 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd1 " + "-device virtio-blk,drive=3Dd2,bootindex=3D2 " + "-drive if=3Dnone,id=3Dd2,media=3Dcdrom,file=3D", = test_cdboot); + qtest_add_data_func("cdrom/boot/as-last-option", + "-device virtio-serial -device virtio-scsi " + "-device virtio-blk,drive=3Dd1,bootindex=3D1 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd1 " + "-device virtio-blk,drive=3Dd2,bootindex=3D2 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd2 " + "-device virtio-blk,drive=3Dd3,bootindex=3D3 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd3 " + "-device scsi-hd,drive=3Dd4,bootindex=3D4 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd4 " + "-device scsi-hd,drive=3Dd5,bootindex=3D5 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd5 " + "-device virtio-blk,drive=3Dd6,bootindex=3D6 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd6 " + "-device scsi-hd,drive=3Dd7,bootindex=3D7 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if=3Dnon= e,id=3Dd7 " + "-device scsi-cd,drive=3Dd8,bootindex=3D8 " + "-drive if=3Dnone,id=3Dd8,media=3Dcdrom,file=3D", = test_cdboot); if (qtest_has_device("x-terminal3270")) { qtest_add_data_func("cdrom/boot/without-bootindex", "-device virtio-scsi -device virtio-serial " --=20 2.47.0