From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459635; cv=none; d=zohomail.com; s=zohoarc; b=XykgsFZtKfz17oLDSNuV2UaVRN8pVtjFhvIJdBn6azRfChHNGxPnl9KZousnoMvnGDW15KP0rOWRGLs6ap50DcwL8RJtDmL5NsbVbDSUtVFUeuGPsDTW8esbUz4q64FB58oIkrw0/wHikkNeQjfmyWbK1l0F01BMGWCSP+pcRg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459635; 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=tcNZj1bG9vMNlzOiY6bmH5RG6FJOa4C4t9+tswaVSt0=; b=TTnnPohJKNM+LmDzeN5TQZPejQp+n4/NLRrWQZ1IoW7QdDztXggAdxJ8O7QQ/9uQtcVONHlqq8lr0g2l7LHHteJ0nt7VT5eIkrcvqABeaSvGBESCSOElwCy9US3GumGAnd1q3RjP1x5XFpVJK9nbylWbLkDRiKhacfX0fg9zYvc= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459635981805.0330388447162; Tue, 11 Aug 2026 07:47:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkV-0002SC-57; Tue, 11 Aug 2026 10:46:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkT-0002QN-Ks; Tue, 11 Aug 2026 10:46:37 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkS-0003ef-8L; Tue, 11 Aug 2026 10:46:37 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDX9Zs451224; Tue, 11 Aug 2026 14:46:34 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvp2vtrq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:34 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfmPt019509; Tue, 11 Aug 2026 14:46:34 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxf5w1f27-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:34 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkWNr7734016 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:33 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A885F5805E; Tue, 11 Aug 2026 14:46:32 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1A05B5805D; Tue, 11 Aug 2026 14:46:32 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:31 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=tcNZj1bG9vMNlzOiY 6bmH5RG6FJOa4C4t9+tswaVSt0=; b=Fl1xEfcBIQ0ESSOvgLdA0Z1hEJzRlJmn0 Jl77QgO8IH1mfvA+uaUm9nTwJEVWX82dGehaZHcbsvQbdXDOvGJ5/fOezdcoeM3s s85thSqA+mBNcWgU5dtv3cgqMoRndpLLGMhlkHI0suBWt/GMBQ96NYWBXtEhNhZC b9aNZmfyi8SvuqfMeJvDw2QRRkEMv4IMqXTn1ASZZpwjDIQIRUHyh+SOAUC4TIzq YNL08c24rEMGyZ0c/0WLLYwK9qQ1pv21JTt5RIhdhxTTRlWk80A4p43ZzgQ2jykg lmTBp5lyekRr/GLZZa736Ufife7DjhbrPfiKTSpQ4enMH7frPtLMg== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 1/8] pc-bios/s390-ccw: Check if a PCI function is already enabled before trying to enable it Date: Tue, 11 Aug 2026 10:46:22 -0400 Message-ID: <20260811144629.866641-2-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=AMtp2X5w c=1 sm=1 tr=0 ts=6a7b35ca cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=rOHUGBc37_MNbdIC:21 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=NApzFvG8OdL9Xanj_wQA:9 a=O8hF6Hzn-FEA:10 X-Proofpoint-GUID: dvsqYDH0762iRg0-QbeUGm9NL_WRL51k X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX9xXWjiApO7vy emX9YjZXM729wPrq8BgtqU9gk4ghSbvFLB85OIpOw1wZWaEB0AsFCn9ZntaY4MMJiJg+05ybbGX NhhdyfbMD5rNTGNXfq3zMb0FqVvYPXMldmsz6CRrE9hfSYn7bLAl235LYRfgxQfHeHUtszjfN0o 4vBS8qwBYzfjs0JaVFT+MT9q+TPr9d+cVfFoYmwy3HF1KqxTPllIsvi7jTiY0i8NQqZY+Jmhtxp NbGyhHSzdljAZ3yyzHukp2ZSuGdcVgqmzYm31plpuywSZEXXwsuy0CHjXXNEyvyzY1L2c+gFWAr yvsjPzKt2q0EYtP3htwxdA0Lrj9mgwMxjkGQX0hFmYqjny6gg2mgrEiYd/NQHPLavIZi5PfTMWL 9SZX3xdEh4K6MdszhyxVCmKuWO+bDwaRV3ZG+GdFFbIfzpFJsDQUgH69OtmvQQEYC3TkPUQo+sK Slpi3z6XgntNn83V1ag== X-Proofpoint-ORIG-GUID: dvsqYDH0762iRg0-QbeUGm9NL_WRL51k X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXzqxKpTSL0nj5 Se84yleqqmVJaKxuraIs1ToFJ9YnQVYUakPLajlY5wkV6nY+lOFkRetwoPBX+Sng8sbMl+0Xrsn KlEnLPXo5YU8OOlYYkYiVghKMPQk8pQ= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=jrossi@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459637516158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Enabling a PCI function that is already configured will result in an error. Simply check if the device has already been enabled, and if so, return without doing anything further; otherwise, enable it as usual. Also, because enable_pci_function() prints its own message, let's remove the duplicate message emitted during the virtio PCI setup steps. Signed-off-by: Jared Rossi Reviewed-by: Zhuoying Cai --- pc-bios/s390-ccw/clp.c | 4 ++++ pc-bios/s390-ccw/virtio-pci.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/clp.c b/pc-bios/s390-ccw/clp.c index ca9565d8de..7917f13345 100644 --- a/pc-bios/s390-ccw/clp.c +++ b/pc-bios/s390-ccw/clp.c @@ -82,6 +82,10 @@ int enable_pci_function(uint32_t *fhandle) { ClpReqRspSetPci rrb; =20 + if (*fhandle & CLP_FHLIST_MASK_CONFIG) { + return 0; /* already enabled */ + } + rrb.request.hdr.len =3D sizeof(ClpReqSetPci); rrb.request.hdr.cmd =3D 0x05; rrb.request.fh =3D *fhandle; diff --git a/pc-bios/s390-ccw/virtio-pci.c b/pc-bios/s390-ccw/virtio-pci.c index f501252c81..231ab6e04d 100644 --- a/pc-bios/s390-ccw/virtio-pci.c +++ b/pc-bios/s390-ccw/virtio-pci.c @@ -452,7 +452,6 @@ int virtio_pci_setup_device(void) VDev *vdev =3D virtio_get_device(); =20 if (enable_pci_function(&vdev->pci_fh)) { - puts("Failed to enable PCI function"); return -ENODEV; } =20 --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459674; cv=none; d=zohomail.com; s=zohoarc; b=YN95RztiUcnlUDSgtV2zckFfuq8ZnYIPR0BYS159ADSC60zi+37x0QIRgISuA1c93AkIJh6RbBS6Ptxc+GmGk3IK07xcCgK5XuFuz5BjxGhXuC7AdE9JRnKpmyfqHSTjRsS5hSRHP7wSpjmSP+MbnOLEHxvrpzqujI4sKMdeH8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459674; 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=qb2wyX466h91vZu55RS8pWPoSu4aHfl3xRVEQ4wwJbc=; b=ctkV0OAHiO1YBheP9KJBLoa31MzfmbJkLpvpNFZOsGRQdbVQqb1Kb7FVkWyTxi1cHALLsiqQbV8RgMDXaLpfFH1kpOi0WgaF3WQg3MldNFt51Lqk0pS4jBwF/C2FFqIZx8JAOa+7A4JnAEoSLrsN5uR0/za9sVcvWza6+H5RRkY= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459674409923.6771536831246; Tue, 11 Aug 2026 07:47:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkX-0002Ta-0v; Tue, 11 Aug 2026 10:46:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkV-0002T7-OL; Tue, 11 Aug 2026 10:46:39 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkU-0003ep-67; Tue, 11 Aug 2026 10:46:39 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDWRiP537294; Tue, 11 Aug 2026 14:46:36 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvm9ng42-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:36 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfEgB019843; Tue, 11 Aug 2026 14:46:35 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxhfy14jx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:35 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkYA922282918 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:34 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 674025805E; Tue, 11 Aug 2026 14:46:34 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D183258043; Tue, 11 Aug 2026 14:46:33 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=qb2wyX466h91vZu55 RS8pWPoSu4aHfl3xRVEQ4wwJbc=; b=ledHjC30MA/0/4RFdwF3x0cB/qvd/JlCX 0ftUu7j17Kw7H+o9l84V0T9uomqdCcspvLWISRP02QI8Th6wo+aZodK9kcTfsl0N 8ZXPxqts9k6k6R2ZjL+9gk5c39w5QMUeEwTB3RTLz9puTZI9X4+okXWwf4P+dzz+ VkLhiLZRE3MTbAFwxw0di9Q4lsXTJ6fFbLH0V3dlUTY4P1AhtlKpk9sF0auqXTj1 HnM6xAJT++vKZX7T8WoZ2b7ySOuimuj8nAwl82DShziTYcVuehuMYL2rmi2MXNpP 9zZbTjwiOgMTGcyHDVh1+X/D139z2ah3dWcaY9kcNTJmwmLkGYjfQ== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 2/8] hw/s390x/ipl: Fix incorrect PCI IPL block length constant Date: Tue, 11 Aug 2026 10:46:23 -0400 Message-ID: <20260811144629.866641-3-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXzOvaniGPDIPB ZkAnojd1Lg3/jEOMT4cn1mQuze8VAIPXii7DlsQmVTIYlToqR1HVEFmeINy2YI5JMuV/AhvmLEP R5tTou7uw/ITXpQqgGYs/Vn3v5hEfLpDmk7a681V3TVr+FeD86h6b8RAURSDnJ3C0qPisTxh+3k kEKfhG/LqvJDqXJsy0NVZiiCr2Z+vM1hNzLs5HZMa6ac5PhK3xAkctjNtvREGC7cPpUc42LgXCa 1242smvpWeSWO85/v1Jf+2a2Y5U54mx9Fx0qAh5+XiYgPj5PdjKZsNBZC106myGLLF+zwBoHqG+ EakEudjGNMlhdk94ccTlsijbY93Y1nFt3RIFX6dGpDneFPSoHNuy5QImcWsq4F5fTGaI64JTSvC UVwq8reL9Bu3u/HMl8tslIt9Ng8dk7SaODDwB7wazUJFdmGR8ImYG+s6o5YpuzjMOXD0eZYtVAC MNr7ODITPAkLhjNG4kw== X-Proofpoint-ORIG-GUID: 5OtjauhSOX4DVytUmAiYe6dIihjwtJxp X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX4hgDZRozjnqX TPNf06qkOoDPEIqkdQlsOTxlXkDpx72bulrswPt0zGWySSvYJu1VsvvZH/0ZFrxg9qQrlsJ51ld oz2qmt2YJYl8Nz9V2mc12ZAyrPY4RsY= X-Authority-Analysis: v=2.4 cv=IfK3n2qa c=1 sm=1 tr=0 ts=6a7b35cc cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=Nzsg8VXm9MNVq0Y9DCkA:9 X-Proofpoint-GUID: 5OtjauhSOX4DVytUmAiYe6dIihjwtJxp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=jrossi@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459675669158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi The IplBlockPci struct is 336 bytes in length. Fix the S390_IPLB_MIN_PCI_LEN to reflect this, and assign a valid blk0_len while we are at it. Signed-off-by: Jared Rossi Reviewed-by: Zhuoying Cai --- hw/s390x/ipl.c | 2 ++ hw/s390x/ipl.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d5fdc3ea0f..fd6e9100f9 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -526,6 +526,8 @@ static bool s390_build_iplb(DeviceState *dev_st, IplPar= ameterBlock *iplb) switch (devtype) { case PCI_DEVTYPE_VIRTIO: iplb->len =3D cpu_to_be32(S390_IPLB_MIN_PCI_LEN); + iplb->blk0_len =3D + cpu_to_be32(S390_IPLB_MIN_PCI_LEN - S390_IPLB_HEADER_LEN); iplb->pbt =3D S390_IPL_TYPE_PCI; iplb->pci.fid =3D cpu_to_be32(pbdev->fid); break; diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index fac30763df..b4d93054a7 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -107,7 +107,7 @@ QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "a= lignment of iplb wrong"); #define S390_IPLB_MIN_PV_LEN 148 #define S390_IPLB_MIN_CCW_LEN 200 #define S390_IPLB_MIN_FCP_LEN 384 -#define S390_IPLB_MIN_PCI_LEN 376 +#define S390_IPLB_MIN_PCI_LEN 336 #define S390_IPLB_MIN_QEMU_SCSI_LEN 200 =20 static inline bool iplb_valid_len(IplParameterBlock *iplb) --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459653; cv=none; d=zohomail.com; s=zohoarc; b=eWnkK+oYa4lg5XGXYByUXOlqpQETF7KdAwMhsR/GhIO66e6rk6VRYnoDeEZI9HOR5Ctk16b9PmO1gWKG7qX7rJbi8/R57tfZ/brWijuzLtJV3wFem5g/JDYC1k2jbecRgiSkKh4BXRkBazMXjBeKuA4VS70v2ZpvMLRPab032/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459653; 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=caT94ZbDmvieUba6jM19revu63rE5oJcPcfOLvQ2Uq8=; b=Y8nOVGVD3leLIHCH4ROwjZIQpR2FnPzy/EDYGrPDb49sqUDVNtXUTmHQm2IuPCff3TXHN+4LXXlhXuwmlA2tfP8WERIalrEBF31etMEifY0Yh2Gpa5XiY0rAt4IqD5/euJhJ+67H/B7YFx+75gKdXwTgXOvYL3ql/LJ2LMhuT7I= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459653298987.151678300003; Tue, 11 Aug 2026 07:47:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkY-0002UZ-NF; Tue, 11 Aug 2026 10:46:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkW-0002TX-Rh; Tue, 11 Aug 2026 10:46:40 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkV-0003fC-8Z; Tue, 11 Aug 2026 10:46:40 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDXAaI3634660; Tue, 11 Aug 2026 14:46:38 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fyb23p621-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:37 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfE0Y002882; Tue, 11 Aug 2026 14:46:37 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxh0g973d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:36 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkadP33292888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:36 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B91758059; Tue, 11 Aug 2026 14:46:36 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7435D5805D; Tue, 11 Aug 2026 14:46:35 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:35 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=caT94ZbDmvieUba6j M19revu63rE5oJcPcfOLvQ2Uq8=; b=MB5X0lpejVIK6eBPwK3VVMAltlOaKRuOX 0SOApdcZJp7SaTQ7DnFVB6wRfGxkoixPqgnow2B7tExddGA6LScSNzu/aJ0SYBnM +RM5eOgzNeRlcpuvom3lPSIHJ3TXech1gxhWrZ8N1bvVHX52PNheEVEbjCqExJ2Y /grTR5EYcVN4DxxRf1+6x2oN8rb9vwJmmcwO7wsIuTnNxZu9969QcAjHkbFTwddB 4I7Fp0Qd/4uVgioFQgwqpko5IGpByW48DcPRCl9rCP6X1iHLzv9GHFp30NLgYiQY wI6e/bEARksM6gyZRTNTefKU/YqWFq/kriRKVc2lL6kSAulc+bkjA== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 3/8] s390x/ipl: Add PCI and bus fields to iplBlockQemuScsi Date: Tue, 11 Aug 2026 10:46:24 -0400 Message-ID: <20260811144629.866641-4-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a7b35cd cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=-QlUfH9WTwOXCv0RR1sA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXw9jQpNBxUKWZ GicpvI1Jiqw3y1FyMUCzZo8L2RAkoVm+QuZEVKC2FNmMOq8icT8Dnvtr+UGpLT6AmpSpU7y3ekH 0IC3q7LQcbi0GMOi9jCrrx36h8krNllU+McCC31NfYPlxCuBPsjt3o9rpMLD7PCmkyOUIWrrlzC QcMyPLN4K3R4CVvTB4nwWFAyuI4KyaMqEzyqOxm51lXgBnS0ZWI6WieJDVAYTO6tHtaUBJ+55SW tVDbBPl9DAFNQGN3oeb9wm2P1qOmwJmrgQMjcWX62kPpB8zD7zWTOxQFCxBm6AKgEWpsRxgQWIw 3mjuMGyFm/3kCjbFP6ClXuvyKhYIYRKNVDt6tatwm5KDxPSMB5SbZNdw1BbJOdSe2WDtdRiyf6k NntDxwfVWAGP6lkWwYXtJkn6d6c69WMJ73SOcEYNTv6RR/PkQivNIvnsawC75OVUVG9MP1gsJbA uHWRT70VbCLi2S+hN7Q== X-Proofpoint-ORIG-GUID: zzvE2pnE10K6VcE0zYFXaiBO3U_Fad6l X-Proofpoint-GUID: zzvE2pnE10K6VcE0zYFXaiBO3U_Fad6l X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX+GBsnGBspWl+ Tanh4tPwG5zEYjLMn58FZQyE7DtxI+veVdC/D8jMG912rGWfarqfGZxsLr3jApJ7+bQmmGhTg7t olODuHQjJ7JCc8pLHLb+B3S1HG5eoYM= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=jrossi@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459653503158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Rather than add a second non-architected IPLB type for scsi-pci devices, let's add the relevant fields to the existing struct so that it can handle both PCI and CCW scsi controllers. The PCI and CCW fields of the IplBlockQemuScsi are aligned with same offsets as the corresponding fields in IplBlockPci and IplBlockCcw for potential union access. Add comments for PCI/CCW specifics and also denote that the S390IplType enum values must fit in uint8_t. Signed-off-by: Jared Rossi --- hw/s390x/ipl.c | 1 + hw/s390x/ipl.h | 2 ++ include/hw/s390x/ipl/qipl.h | 13 +++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index fd6e9100f9..7e68be4c20 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -482,6 +482,7 @@ static bool s390_build_iplb(DeviceState *dev_st, IplPar= ameterBlock *iplb) iplb->scsi.lun =3D cpu_to_be32(sd->lun); iplb->scsi.target =3D cpu_to_be16(sd->id); iplb->scsi.channel =3D cpu_to_be16(sd->channel); + iplb->scsi.bus =3D S390_IPL_TYPE_CCW; iplb->scsi.devno =3D cpu_to_be16(ccw_dev->sch->devno); iplb->scsi.ssid =3D ccw_dev->sch->ssid & 3; break; diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index b4d93054a7..0734d72117 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -86,6 +86,8 @@ struct S390IPLState { uint16_t devno; }; QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wr= ong"); +QEMU_BUILD_BUG_MSG(offsetof(IplBlockQemuScsi, fid) !=3D offsetof(IplBlockP= ci, fid), + "iplb fields misaligned across bus types"); =20 #define DIAG_308_RC_OK 0x0001 #define DIAG_308_RC_NO_CONF 0x0102 diff --git a/include/hw/s390x/ipl/qipl.h b/include/hw/s390x/ipl/qipl.h index 8d3c83a80b..8d3937376b 100644 --- a/include/hw/s390x/ipl/qipl.h +++ b/include/hw/s390x/ipl/qipl.h @@ -25,7 +25,7 @@ enum S390IplType { S390_IPL_TYPE_CCW =3D 0x02, S390_IPL_TYPE_PCI =3D 0x04, S390_IPL_TYPE_PV =3D 0x05, - S390_IPL_TYPE_QEMU_SCSI =3D 0xff + S390_IPL_TYPE_QEMU_SCSI =3D 0xff /* Max value, must fit in uint8_t */ }; typedef enum S390IplType S390IplType; =20 @@ -103,9 +103,14 @@ struct IplBlockQemuScsi { uint32_t lun; uint16_t target; uint16_t channel; - uint8_t reserved0[77]; - uint8_t ssid; - uint16_t devno; + uint8_t bus; + uint8_t reserved0[76]; + uint8_t ssid; /* CCW only */ + uint16_t devno; /* CCW only */ + uint8_t reserved1[216]; + uint8_t opt; /* PCI only */ + uint8_t reserved2[3]; + uint32_t fid; /* PCI only */ } QEMU_PACKED; typedef struct IplBlockQemuScsi IplBlockQemuScsi; =20 --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459645; cv=none; d=zohomail.com; s=zohoarc; b=iuM5G5cKfz9txzLrkOqU78EF2NvJJB71WQ5mEzmkAGpuqxW2DpVmfW7SaUYSz4G1k3ff4mLD2JddLchmVcljXyJl7kOp+u9n93D7R/6CrCdIOYhQ/xobRfRYjVHyzDCiIkBSGgfs4LGi8E2edUxytuUzrttiRHx9F1EKkFwmffE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459645; 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=aRUFxnf4xEDz8RkjYlHxhP0Etlur8sVgIvgQtb45lxs=; b=igpL5JldAGdm6Q36LpfmIO+4+u7SjtEo2gDdJAABFiwEYoggWilE9gIVWdLMcVxdzB3A8S4rymUsbxvm/eozRKhmCLlmeh/9inX1IHSPylnhT6Azv+6CtAoEFPlWW07BPpfgB1DELgAedNdBM9IINsb/MTYe2VIlcFDo5Y4IpRQ= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459645929410.2352313007618; Tue, 11 Aug 2026 07:47:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkc-0002Xz-8g; Tue, 11 Aug 2026 10:46:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnka-0002Uv-Dh; Tue, 11 Aug 2026 10:46:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkY-0003ff-Iz; Tue, 11 Aug 2026 10:46:44 -0400 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDWP9B537270; Tue, 11 Aug 2026 14:46:41 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvm9ng4d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:40 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfHRa001973; Tue, 11 Aug 2026 14:46:40 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxesq1ga5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:39 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEk0fM20775624 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:00 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1EE1958059; Tue, 11 Aug 2026 14:46:38 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8410B58043; Tue, 11 Aug 2026 14:46:37 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:37 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=aRUFxnf4xEDz8RkjY lHxhP0Etlur8sVgIvgQtb45lxs=; b=BcOnXFBXiiE4ZR1UEnnRbynAJwcjHYs9m dsaZbkyZvUZPZFJivLr8DkGo6Lhyd/1tKM29UoXFewPRkFW10y81EcoCUX1IeWN9 0ZD89ibfC2xcnET0GbYcmibE28F0jk37oZms8f8G4Bc4Td0m2OObfF63esNVCEms durV7wBBJvflqIAOqXSB4Lvo2TcQN9mGOsrGPv7XHAXn66m2j22KOiI9Bk+Lrr/k bVUWWdWcbgqWth8jgtNou/L8mOjdtRwkULYfUT0GxZY4lD7Bf0peFRb4aRK9StJg OAUJfshS8R1Fs7LGBlCJXH/6IoULVprBpdfXqCKZYm0hHcFvbXIkQ== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 4/8] pc-bios/s390-ccw: Use bus specific IPL_TYPE directly for scsi IPL Date: Tue, 11 Aug 2026 10:46:25 -0400 Message-ID: <20260811144629.866641-5-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXzJmxBoEaCNkS BBnu0OJVqHtKu9IRjM7hFa1WNq34lyYpq34Ff8vHzIpec2tPAnLxNSs+npy3/b2iIG98acnHIhY 7LEkgwCpo9gP13k0L/HTvr4E0BBekBr733/lQ+V48wgRZ5/Fk8p7ymiO/YrRtpp87bfnRZyKkrZ n7xXTGHrs9OJxNeNOZcymwzaSHQ8fkRmRJk+m0d+y4xnGNV2niXuoLJVUWnF48QexlY7xciP7a5 27wBoOAxKTUs4ZO2acTbr3eCaA3t0NulXhENeVPblAM4ROiTp0oUO3m3veGG1C5qsuYhCFoF34m cs+9WKF5Yt/NSNY3NDp1wJGQLj2F0LvWPoGNr4fcDUk9TwsrhqitcRNM4XmZBNSe3YeHTP7tZ2W JtVIAgmZc088lQNEy/Lz+iKXjpwB2WlLceUTfDbjReBYyHGankDdZwQILjyoPFayUoA83Z0Ibuz XmbPVuFWTn07e0MJraQ== X-Proofpoint-ORIG-GUID: klI6wTQfOq_L-xekb5gNovhHU3clVKwO X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXzAA/9BR0p/Vh AUB8iHjptjirFCtpbzmzVWrHxL5HtYxUPOkXE6p7LHE3QOS4CUnXNXV87EXuLUjXuYzN4votqZF YblHk5cuuHi3el27uA4OlcdaYMw+TLQ= X-Authority-Analysis: v=2.4 cv=IfK3n2qa c=1 sm=1 tr=0 ts=6a7b35d0 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=__HpbD2NEqU3pYqaDEYA:9 X-Proofpoint-GUID: klI6wTQfOq_L-xekb5gNovhHU3clVKwO X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=jrossi@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459647507158501 Content-Type: text/plain; charset="utf-8" From: Jared Rossi All existing switch cases that handle S390_IPL_TYPE_QEMU_SCSI directly fall through to S390_IPL_TYPE_CCW. Rather than always fall through, reassign vdev->ipl_type to the appropriate bus for the scsi controller and proceed as usual, where the bus is designated by the "bus" field and set during the IPLB build. Because S390_IPL_TYPE_QEMU_SCSI should not appear as an ipl_type once the device is found, remove that specific case from other existing switches and allow it to land in the default case, which will generally result in an immediate error. Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/main.c | 13 ++++++++++--- pc-bios/s390-ccw/virtio-blkdev.c | 1 - pc-bios/s390-ccw/virtio.c | 5 ----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 8bc6e8eaa3..63692260a4 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -257,8 +257,16 @@ static bool find_boot_device(void) vdev->selected_scsi_device.channel =3D iplb.scsi.channel; vdev->selected_scsi_device.target =3D iplb.scsi.target; vdev->selected_scsi_device.lun =3D iplb.scsi.lun; - blk_schid.ssid =3D iplb.scsi.ssid & 0x3; - found =3D find_subch(iplb.scsi.devno); + vdev->ipl_type =3D iplb.scsi.bus; + switch (vdev->ipl_type) { + case S390_IPL_TYPE_CCW: + blk_schid.ssid =3D iplb.scsi.ssid & 0x3; + found =3D find_subch(iplb.scsi.devno); + break; + default: + puts("Unrecognized SCSI controller"); + break; + } break; case S390_IPL_TYPE_PCI: found =3D find_fid(iplb.pci.fid); @@ -342,7 +350,6 @@ static void ipl_pci_device(void) static void ipl_boot_device(void) { switch (virtio_get_device()->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: ipl_ccw_device(); break; diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blk= dev.c index 98b6cec3a0..83a1185dd5 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -253,7 +253,6 @@ int virtio_blk_setup_device(VDev *vdev) puts("Using virtio-blk."); =20 switch (vdev->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: return virtio_ccw_setup(vdev); case S390_IPL_TYPE_PCI: diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index a0d249db24..0b33544144 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -61,7 +61,6 @@ char *virtio_get_ring_area(int ring_num) int drain_irqs(void) { switch (vdev.ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: return drain_irqs_ccw(vdev.schid); default: @@ -109,7 +108,6 @@ void vring_init(VRing *vr, VqInfo *info) bool vring_notify(VRing *vr) { switch (vdev.ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: vr->cookie =3D virtio_ccw_notify(vdev.schid, vr->id, vr->cookie); break; @@ -130,7 +128,6 @@ bool vring_notify(VRing *vr) bool be_ipl(void) { switch (virtio_get_device()->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: return true; case S390_IPL_TYPE_PCI: @@ -231,7 +228,6 @@ int vring_wait_reply(void) int virtio_reset(VDev *vdev) { switch (vdev->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: return virtio_ccw_reset(vdev); case S390_IPL_TYPE_PCI: @@ -244,7 +240,6 @@ int virtio_reset(VDev *vdev) bool virtio_is_supported(VDev *vdev) { switch (vdev->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: case S390_IPL_TYPE_CCW: return virtio_ccw_is_supported(vdev); case S390_IPL_TYPE_PCI: --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459625; cv=none; d=zohomail.com; s=zohoarc; b=U/yLd4eV5ez2Wy4JiB6UwHC9Uy2KCcFwAmdWAy1ogSA8KWrwF9gd+nG9TCRnOd8WQ0YCfQhzvd9h82VJg7Q9D0Q2uNO12aubmMbBURpI3NMxM1hJYPCW+pC4+cr89PZIumZnG7LjFlKe0JEDvD9lMoOpjqMbqr0dubDQX2sQe1w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459625; 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=xuOZiOd7rtc9H/HxsjgYJDkbvhn+I80yBwm3cQLhm+0=; b=mlbh2x6w2IE82JxibNmM6WP5tIlfA7HUImYI/05Pti/i+6rNspno4k8pOz/5gNGZ8Gq73zEsLhQIOPSO2kNABC7Vaq+W6BSNq+8ca+xyU9sP77cuL5xIhdV9+jXeGYpPyldhlBmfgZUsnUwK0x45ikviBY5/98e6AAqHvxT0E9Y= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459625361153.14678159161951; Tue, 11 Aug 2026 07:47:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkc-0002YF-Lp; Tue, 11 Aug 2026 10:46:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkb-0002VR-Aq; Tue, 11 Aug 2026 10:46:45 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkZ-0003ft-Lt; Tue, 11 Aug 2026 10:46:45 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDWwKT3633650; Tue, 11 Aug 2026 14:46:42 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fyb23p62b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:42 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfGYY001967; Tue, 11 Aug 2026 14:46:41 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxesq1ga9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:41 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkdeT64225588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:40 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9FC725805D; Tue, 11 Aug 2026 14:46:39 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 157AF58055; Tue, 11 Aug 2026 14:46:39 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:38 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=xuOZiOd7rtc9H/Hxs jgYJDkbvhn+I80yBwm3cQLhm+0=; b=SlKMr657n5Wu11Nbf1iZGREdqLBggEBZp c21fA00UfBvU2yWG3rO59uO4VL1oN+N5nuYFlC4nRnr8oSqNRuMw6Tr/xyayRIIy YR1pM/7lbktVZBeKUpC3Fr36iTwCIwoQ3klMxP0+FI0rN2NA1eULhmn3j9Q6m2GN M04JRctP/gSlrZzSEWKGh1SlRUZL4a08Iqt4LWnM9PI51XpNc7NFmDwroJDJ43UW bIQk4kyIoXO+xxlAc47O/OVrgMZG4JSrXnb/Z9Y6OqYO8q+FCqR/q9FlDBuBRyWg P9zAtKAYhN8xSDOsZDHD/bYI+yWzxtzDLU7CPT5mL8eQVyzdPil/A== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 5/8] pc-bios/s390-ccw: Abstract virtio_run() for generic use Date: Tue, 11 Aug 2026 10:46:26 -0400 Message-ID: <20260811144629.866641-6-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a7b35d2 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=0PGiSlKGR9UV7cgr1PYA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX8jj2IEm52+FW 9E70xmF2FJiRFGyYmFeI4PxdoETCxSKA+G0Yr9Y+eHT48XqGZhYU0j27Q6jIeARvAogUpSDfwQ4 /Bgki66XtiOumw7WMjYNu0EpRA5if4uhmZVn+TuXEAzHsmqSbi7VRoabrGb6yTO+Ums4fbOGdI4 jcNpxJK7QV/IoVrH6VizyxsL9DXz3CWLVnq1QyVIURxDDW6DH67dfLZ9TcXYIjBds8VX5bGOC9T lpuurhwGugHA+9zh/Wo8E9NIoBkbS6GXm0gRZzTRTwBzI9MNOBSpe1sgy/sEPCx1VWdTkFBrzie Fl912n+XrL5Q56/5TH3W1iA3M0pLMHQLZsjj6D0dk2jSkQrzlfmYaI/mk9Q8dsE4dGV0VtL2Wgh uZjf+KLaurqBOs5B0rNVXNwb8GocUqgc2tz+7oR6ZDziJImAPpyAFxHi7CwxXo2aCEE5Kqk2PxV 81/cB9J0MHS/a0J3fRw== X-Proofpoint-ORIG-GUID: mfdKgguGmcFOLu_n7qffhe6ZNX3SIYYB X-Proofpoint-GUID: mfdKgguGmcFOLu_n7qffhe6ZNX3SIYYB X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX5+8F0wykgm8l J1zuxFp30WsvchvppGL7ii4xyvUIafWo/fE5fOEtCOCmj2LDQxY7BB0aacgVl7XiCs5MNNfkz6G BjjG6O7LRfB2VJ7sy6woaF2tU11qYys= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=jrossi@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459627666158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi The existing virtio_ccw_run() actually has no dependency on CCW. Rather than add a case for non-ccw devices, we can just put main logic right in the virtio_run() call so that it can be used for other bus types directly. Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/virtio-ccw.c | 17 ----------------- pc-bios/s390-ccw/virtio-ccw.h | 1 - pc-bios/s390-ccw/virtio.c | 16 +++++++++++----- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/pc-bios/s390-ccw/virtio-ccw.c b/pc-bios/s390-ccw/virtio-ccw.c index 5cb2158ed2..ea5dbc2857 100644 --- a/pc-bios/s390-ccw/virtio-ccw.c +++ b/pc-bios/s390-ccw/virtio-ccw.c @@ -107,23 +107,6 @@ long virtio_ccw_notify(SubChannelId schid, int vq_idx,= long cookie) vq_idx, cookie); } =20 -int virtio_ccw_run(VDev *vdev, int vqid, VirtioCmd *cmd) -{ - VRing *vr =3D &vdev->vrings[vqid]; - int i =3D 0; - - do { - vring_send_buf(vr, cmd[i].data, cmd[i].size, - cmd[i].flags | (i ? VRING_HIDDEN_IS_CHAIN : 0)); - } while (cmd[i++].flags & VRING_DESC_F_NEXT); - - vring_wait_reply(); - if (drain_irqs()) { - return -1; - } - return 0; -} - int virtio_ccw_reset(VDev *vdev) { return run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0, false); diff --git a/pc-bios/s390-ccw/virtio-ccw.h b/pc-bios/s390-ccw/virtio-ccw.h index a506767eaa..43d21906e5 100644 --- a/pc-bios/s390-ccw/virtio-ccw.h +++ b/pc-bios/s390-ccw/virtio-ccw.h @@ -16,7 +16,6 @@ extern SubChannelId blk_schid; /* virtio-ccw.c */ int drain_irqs_ccw(SubChannelId schid); bool virtio_ccw_is_supported(VDev *vdev); -int virtio_ccw_run(VDev *vdev, int vqid, VirtioCmd *cmd); long virtio_ccw_notify(SubChannelId schid, int vq_idx, long cookie); int virtio_ccw_setup(VDev *vdev); int virtio_ccw_reset(VDev *vdev); diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 0b33544144..34c5e6ee22 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -70,13 +70,19 @@ int drain_irqs(void) =20 int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd) { - switch (vdev->ipl_type) { - case S390_IPL_TYPE_QEMU_SCSI: - case S390_IPL_TYPE_CCW: - return virtio_ccw_run(vdev, vqid, cmd); - default: + VRing *vr =3D &vdev->vrings[vqid]; + int i =3D 0; + + do { + vring_send_buf(vr, cmd[i].data, cmd[i].size, + cmd[i].flags | (i ? VRING_HIDDEN_IS_CHAIN : 0)); + } while (cmd[i++].flags & VRING_DESC_F_NEXT); + + vring_wait_reply(); + if (drain_irqs()) { return -1; } + return 0; } =20 void vring_init(VRing *vr, VqInfo *info) --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459635; cv=none; d=zohomail.com; s=zohoarc; b=EMHvJ59XQvFjZMuKuEr2RvkHL5RjgpWvmWgNy0LzJ6dVuETxe0CwfL4SEBfwnDegKSJ+fGVtWRHBTpfMjTzauJSRlKkQJYrlkTrs2BCibgw7XrKPm75H0j1qiwXQFoVaYPs4iKu24zBG7lta7p2v/FeUovMdZ+CkioflAEkn7V0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459635; 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=wYRRuc+muzR2Kk+N6viEz8MaYF32b4UxfVveXUWeW3U=; b=efsKLJDC4Dfmq4dVtIjKcsP0EP/W1GzSBCp+8aEwPAlWkEqXotDPSqqtdjM+bLyD3ZaJFSLeBb50FAIieXtx0s45ry9+RzSWAkwBVr0EfLRZf7F2WWXWykc7sxmggCLYX2FWCxbAd+BlUGOMf4pcSAnHazq4C+twlvZE/AutI2w= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459635183913.863047974857; Tue, 11 Aug 2026 07:47:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnke-0002a4-5W; Tue, 11 Aug 2026 10:46:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkc-0002YD-Hc; Tue, 11 Aug 2026 10:46:46 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnka-0003g6-R3; Tue, 11 Aug 2026 10:46:46 -0400 Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDXAaK3634660; Tue, 11 Aug 2026 14:46:43 GMT Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fyb23p62d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:43 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfIMS023482; Tue, 11 Aug 2026 14:46:42 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxg9h198j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:42 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkfO546203186 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:41 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 20CD458055; Tue, 11 Aug 2026 14:46:41 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89A445805D; Tue, 11 Aug 2026 14:46:40 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:40 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=wYRRuc+muzR2Kk+N6 viEz8MaYF32b4UxfVveXUWeW3U=; b=FB0DNXfgjvefITQyjwhvkGmuXVCUhp4fw UZnESBh5X2pNWFbGbQF2TxIKaQ3sE53UDONXgvxaRE4BBX5KMJtixm/H0HMp6tjz tnJ0Ay30uqrXwyZMf5xgv5djg9UyZ5SVoiLaFx9oOLf3pLI9OSgkKq2lDYPVopCh 9km4uVnzsPpyurwQG2ijcD2w2XjhtoaakhWS7rxrzfIMT6AJ4DW/x3uaDWK4N2nL FaQiiq4DoSTkdYSgCwIsX3RMPqY+a02UxZdwKjGQuLuPMwzCO+UU1WXyvFPpkWLy jGy+g/orLVXO0Kbvf0wGWxqv23G1jPf4OptI6/e6hydg72BSvQdVQ== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 6/8] pc-bios/s390-ccw: Add support for virtio-scsi-pci IPL Date: Tue, 11 Aug 2026 10:46:27 -0400 Message-ID: <20260811144629.866641-7-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a7b35d3 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=_aD-10DgKkLGNpmbtU8A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXw7jRjpz5egON bwKAnPHk6ahvpQs8gObdSOQ6LMKgad00eds3/S2RRBNbFkQVfOJ6m42SYWQ2HtVl6QYBkxtqRoN +ZNXLH3u/Z/sJH3moTheX7Gp5eVc0Ev3Pv33+GnyHnQBiQwyJ2WXTAmq2uWs6UFCOnUji071SSM RQpVPBXpVyc/wuJm7yFTHl3tbvMBkzr4GEeIqC59h2dGsse9zJ4dMrB03PWlZublizz8fuhmg8q Ksb8HqJEoUez5PClNdwb8xBb2KQWqkJzJxGmPlx+LtSDji/zCrNv5MzNYILgjNMMeDztCVFsPSR gBzAVcxCmgKm5vic6Lvyp5pnO2TyBZemLL1Xlzbb4ATmsTFDbR8U8CcKpqJ4oi8owfdEv04zP9e 9G2Jssj7WqAMui8OId+6dWqUQsTPPSK3ITJ3IySAug/gMG9C3XkrERrb2oCqWwxm+uJJqGpx4zD slia8wIwJs0qmBXzUYQ== X-Proofpoint-ORIG-GUID: sEn56dJLIMKL-o9VZhFdvEP5XqVW2kh9 X-Proofpoint-GUID: sEn56dJLIMKL-o9VZhFdvEP5XqVW2kh9 X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX9nNhg+F0yMoH BzkEAOAiAdAtdHYvT0FseFS1u5cBeDONS5DpOU/Ds7ea7VUDQ2E909UD7uvufxZM0blvNeCSN4C /WJG7vqmM6mqdyfgVVoQc4tEXQf1P+Q= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=jrossi@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459637502158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Read virtio-pci configuration and configure virt-queue for scsi devices. Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/main.c | 3 ++- pc-bios/s390-ccw/virtio-pci.c | 30 ++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio-scsi.c | 12 +++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 63692260a4..50f455324e 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -269,6 +269,7 @@ static bool find_boot_device(void) } break; case S390_IPL_TYPE_PCI: + vdev->scsi_device_selected =3D false; found =3D find_fid(iplb.pci.fid); break; default: @@ -329,13 +330,13 @@ static void ipl_pci_device(void) { VDev *vdev =3D virtio_get_device(); vdev->is_cdrom =3D false; - vdev->scsi_device_selected =3D false; =20 if (virtio_pci_setup_device()) { return; } =20 switch (vdev->dev_type) { + case VIRTIO_ID_SCSI: case VIRTIO_ID_BLOCK: if (virtio_setup() =3D=3D 0) { zipl_load(); /* only return on error */ diff --git a/pc-bios/s390-ccw/virtio-pci.c b/pc-bios/s390-ccw/virtio-pci.c index 231ab6e04d..277c3ea68d 100644 --- a/pc-bios/s390-ccw/virtio-pci.c +++ b/pc-bios/s390-ccw/virtio-pci.c @@ -52,6 +52,10 @@ void virtio_pci_id2type(VDev *vdev, uint16_t device_id) case 0x1001: vdev->dev_type =3D VIRTIO_ID_BLOCK; break; + case 0x1048: + case 0x1004: + vdev->dev_type =3D VIRTIO_ID_SCSI; + break; default: vdev->dev_type =3D 0; } @@ -199,6 +203,26 @@ static int virtio_pci_get_blk_config(void) return rc; } =20 +static int virtio_pci_get_scsi_config(void) +{ + VirtioScsiConfig *cfg =3D &virtio_get_device()->config.scsi; + int rc =3D vpci_read_flex(d_cap.off, d_cap.bar, cfg, sizeof(VirtioScsi= Config)); + + /* all fields of scsi config must be byte swapped */ + cfg->num_queues =3D bswap32(cfg->num_queues); + cfg->seg_max =3D bswap32(cfg->seg_max); + cfg->max_sectors =3D bswap32(cfg->max_sectors); + cfg->cmd_per_lun =3D bswap32(cfg->cmd_per_lun); + cfg->event_info_size =3D bswap32(cfg->event_info_size); + cfg->sense_size =3D bswap32(cfg->sense_size); + cfg->cdb_size =3D bswap32(cfg->cdb_size); + cfg->max_channel =3D bswap16(cfg->max_channel); + cfg->max_target =3D bswap16(cfg->max_target); + cfg->max_lun =3D bswap32(cfg->max_lun); + + return rc; +} + static int virtio_pci_negotiate(void) { int i, rc; @@ -330,6 +354,7 @@ bool virtio_pci_is_supported(VDev *vdev) if (vdev->vendor_id =3D=3D PCI_VENDOR_VIRTIO) { switch (vdev->dev_type) { case VIRTIO_ID_BLOCK: + case VIRTIO_ID_SCSI: return true; default: return false; @@ -384,6 +409,11 @@ int virtio_pci_setup(VDev *vdev) vdev->cmd_vr_idx =3D 0; virtio_pci_get_blk_config(); break; + case VIRTIO_ID_SCSI: + vdev->nr_vqs =3D 3; + vdev->cmd_vr_idx =3D 2; + virtio_pci_get_scsi_config(); + break; default: puts("Unsupported virtio device"); return -ENODEV; diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c index 9ea00c6fe6..095d7ac430 100644 --- a/pc-bios/s390-ccw/virtio-scsi.c +++ b/pc-bios/s390-ccw/virtio-scsi.c @@ -16,6 +16,7 @@ #include "scsi.h" #include "virtio-scsi.h" #include "virtio-ccw.h" +#include "virtio-pci.h" #include "s390-time.h" #include "helper.h" =20 @@ -479,7 +480,16 @@ static int virtio_scsi_setup(VDev *vdev) =20 int virtio_scsi_setup_device(VDev *vdev) { - virtio_ccw_setup(vdev); + switch (vdev->ipl_type) { + case S390_IPL_TYPE_CCW: + virtio_ccw_setup(vdev); + break; + case S390_IPL_TYPE_PCI: + virtio_pci_setup(vdev); + break; + default: + return 1; + } =20 if (vdev->config.scsi.sense_size !=3D VIRTIO_SCSI_SENSE_SIZE) { puts("Config: sense size mismatch"); --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459669; cv=none; d=zohomail.com; s=zohoarc; b=CNgaoRsQFSVP9sv8poXLFQ519pBO2+EoKmrP9I6Tu856Rr78rK5pZ251KJAO6nmVRz3IgQk4edXxrXOgOGYgV9BR00OASI5weMZVtvImBHzRvolPwZArOY/+TQt7t0nrWvriwBgX3yvZg4OWs0G4f9Zu6061xvmy2e8fehefC0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459669; 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=4Brz6gunKDfUfYuv5wgJ4qzXmCL8uVATvvQWXPiwpv0=; b=c98pFMyB6ITKxgDLuQ2SIdSd6CsMXMdugWcOvdpR9uVnM9eXg4JurtNvvTMXxHIvx0wnyHbSyOROalku+GBLmbnL28lsEuNK0gqi6WUtBnvXzC06/96nFUxWJvr7BOg6ZhhqCAsLjsqHSSsc2eaxxfWChGkMXbyIw2OT6szcI/s= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459669972255.6821994915798; Tue, 11 Aug 2026 07:47:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkh-0002cQ-4H; Tue, 11 Aug 2026 10:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnke-0002bF-W8; Tue, 11 Aug 2026 10:46:49 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkd-0003gZ-6o; Tue, 11 Aug 2026 10:46:48 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDWjmZ492651; Tue, 11 Aug 2026 14:46:45 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvq9defm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:45 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfE1T005344; Tue, 11 Aug 2026 14:46:44 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxfsjsc3k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:44 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkgT124052434 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:43 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A5F5358055; Tue, 11 Aug 2026 14:46:42 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1B3E058043; Tue, 11 Aug 2026 14:46:42 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=4Brz6gunKDfUfYuv5 wgJ4qzXmCL8uVATvvQWXPiwpv0=; b=Z44Sh4n4YyW+9uLmYY21YyAIYWwMblY82 sXAuTQLz52Tqka/YDBf5XS5eeqNf2x8q2XVG0+qJEysjYWnelUN+XOF+ZOkpPS99 jITUbRWPKVcekrB76qFK0ioqeAKNVQqDm1+PMK/Yl+/qv54x3H4EuWc2nkmvhAAj 3Qdqp1b5EOZv9QJP8EqnkK44rns88Dnfrli98iEk2/GrCELlfS1XRZCG0PcvC2eu nT4aK8FweMjpRh+cv9luejSjT3hMJeTS2hgEkPuaNPQTBvRpb1eHgYrl6W7xKBD8 F9XZdRuhc5Isy/NKrzd3BcWwwdLleFuDmMfhPvj8sgt68Tn+8hpOw== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 7/8] s390x: Find scsi-pci boot device and build IPLB Date: Tue, 11 Aug 2026 10:46:28 -0400 Message-ID: <20260811144629.866641-8-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: INsbne7kMQ94uUROJH-aBvfdJMdQcZ5C X-Authority-Analysis: v=2.4 cv=PbDPQChd c=1 sm=1 tr=0 ts=6a7b35d5 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=GdLXXov1tT0adLAbiZYA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfXxk9cm0RuaZFS C9R3/9qxiZmoTyGaIWTncB45jDLoZyhN2J3246NNbdk6x8GMwaewVEbK9477jRkKQcBcLj3qQpD BvX52kclqeT3Wzi9EPcPuKhhaMT9nZJx4gMvOhxHPHgp6UjXF11xNWBykZzM9EMnEQDwcjFDrAT cfdtVgu3uYGJmNIeuzZnBpgjNL1Z9TDAgD0x2SlyQkG5Uu4PyXzAw+qffC9cOTL29hGd/MpTHME i97nXftbi8t9DaahG159vPj0MglCKxtNoxFbji26ssR8+TRLy2NteyXrN+VuMntiGoQrBQ8zPQn tJ8EtEZlLCZWjprmIWawwSpy5PJD64qbgoXf8v2dCydSdgpENc+ZmRr0hmdcdPQ0CzHULhiHTED Lyap4nbD2iXSQ+sfjLhaKkk/P2zcAigcDDWKE/F0ECtTd8gnSYDZfjc1sk7dYdDXnn0HzwrVC0i uAhQNqRvEsxiCYtAFLA== X-Proofpoint-ORIG-GUID: INsbne7kMQ94uUROJH-aBvfdJMdQcZ5C X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX7b9m1d0+q/7j bGBraKU3J4ZPd1IHvSM+4Z2jvh3Zvc9MmN1CSLBpjq8laqYAwJ9cZ0hLFfjYtymqgLVv3nEc8/O tbnndnumZk/zbEF5QF6WnbFhAA92Fnw= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 impostorscore=0 malwarescore=0 adultscore=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.156.1; envelope-from=jrossi@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459673654158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Add logic to identify a virtio-pci scsi controller and target lun with assigned bootindex, then build IPLB for it. Unfence PCI case for scsi devices in BIOS. Signed-off-by: Jared Rossi --- hw/s390x/ipl.c | 37 +++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/main.c | 3 +++ 2 files changed, 40 insertions(+) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 7e68be4c20..3ab48e1224 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -401,6 +401,7 @@ static CcwDevice *s390_get_ccw_device(DeviceState *dev_= st, int *devtype) } =20 #define PCI_DEVTYPE_VIRTIO 0x05 +#define PCI_DEVTYPE_SCSI 0x06 =20 static S390PCIBusDevice *s390_get_pci_device(DeviceState *dev_st, int *dev= type) { @@ -416,6 +417,26 @@ static S390PCIBusDevice *s390_get_pci_device(DeviceSta= te *dev_st, int *devtype) if (pbdev) { tmp_dt =3D PCI_DEVTYPE_VIRTIO; } + } else { + SCSIDevice *sd =3D (SCSIDevice *) + object_dynamic_cast(OBJECT(dev_st), TYPE_SCSI_DEVICE); + if (sd) { + SCSIBus *sbus =3D scsi_bus_from_device(sd); + VirtIODevice *vdev =3D (VirtIODevice *) + object_dynamic_cast(OBJECT(sbus->qbus.parent), + TYPE_VIRTIO_DEVICE); + if (vdev) { + pci_dev =3D (PCIDevice *) + object_dynamic_cast(OBJECT(qdev_get_parent_bus(DEV= ICE(vdev))->parent), + TYPE_PCI_DEVICE); + if (pci_dev) { + pbdev =3D s390_pci_find_dev_by_pci(s390_get_phb(),= pci_dev); + if (pbdev) { + tmp_dt =3D PCI_DEVTYPE_SCSI; + } + } + } + } } } if (devtype) { @@ -532,6 +553,22 @@ static bool s390_build_iplb(DeviceState *dev_st, IplPa= rameterBlock *iplb) iplb->pbt =3D S390_IPL_TYPE_PCI; iplb->pci.fid =3D cpu_to_be32(pbdev->fid); break; + case PCI_DEVTYPE_SCSI: + sd =3D SCSI_DEVICE(dev_st); + scsi_lp =3D object_property_get_str(OBJECT(sd), "loadparm", NU= LL); + if (scsi_lp && strlen(scsi_lp) > 0) { + lp =3D scsi_lp; + } + iplb->len =3D cpu_to_be32(S390_IPLB_MIN_PCI_LEN); + iplb->blk0_len =3D + cpu_to_be32(S390_IPLB_MIN_PCI_LEN - S390_IPLB_HEADER_LEN); + iplb->pbt =3D S390_IPL_TYPE_QEMU_SCSI; + iplb->scsi.lun =3D cpu_to_be32(sd->lun); + iplb->scsi.target =3D cpu_to_be16(sd->id); + iplb->scsi.channel =3D cpu_to_be16(sd->channel); + iplb->scsi.bus =3D S390_IPL_TYPE_PCI; + iplb->scsi.fid =3D cpu_to_be32(pbdev->fid); + break; default: return false; } diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 50f455324e..40b21f5f87 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -263,6 +263,9 @@ static bool find_boot_device(void) blk_schid.ssid =3D iplb.scsi.ssid & 0x3; found =3D find_subch(iplb.scsi.devno); break; + case S390_IPL_TYPE_PCI: + found =3D find_fid(iplb.scsi.fid); + break; default: puts("Unrecognized SCSI controller"); break; --=20 2.54.0 From nobody Wed Aug 26 07:24:08 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=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1786459629; cv=none; d=zohomail.com; s=zohoarc; b=KF+QNGebR6s62K/4rhoLdK0fPj29EKspJ4/PiYijR1nvhxgRsyYWg0kR0LIXaQYCKCXZYUiX8xHseUf2+O4I7/zAHRMU3nq7v2Rc3libVIC95K8E33kd1Tpld4bh9qm4RxLvpI9xnaoU81wFjucycEGz96ZQpqWp6LNmMKyPPaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1786459629; 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=FxCr26HQGGPcNVJuIcyctYV5TU9dYfbvI5MmrgksQyA=; b=FhW3SQvnkG+xNnRYhOyYp4fsLkJhnAgNqAZI70OWq4DqKVzTInY4+u7FY+lTfqksf6ZG9TaJ3TIJm7gUCsv07IfA5t3DRdcF2krixnmdE9GDP1XjTwgDKkdB/xplhbU65WIhgL5PhMz487OtjBcDIBx9wKaviqbCiGUTtbjGHw0= 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=reject dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1786459629825754.7714837586124; Tue, 11 Aug 2026 07:47:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wtnkf-0002bf-ML; Tue, 11 Aug 2026 10:46:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnke-0002aE-ET; Tue, 11 Aug 2026 10:46:48 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wtnkc-0003gc-Uj; Tue, 11 Aug 2026 10:46:48 -0400 Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BDXAXH451252; Tue, 11 Aug 2026 14:46:45 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fwvp2vtsq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:45 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67BEfEkW019833; Tue, 11 Aug 2026 14:46:45 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([172.16.1.9]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxhfy14kj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Aug 2026 14:46:45 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (smtpav06.dal12v.mail.ibm.com [10.241.53.105]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67BEkiL734472322 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Aug 2026 14:46:44 GMT Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E36C58043; Tue, 11 Aug 2026 14:46:44 +0000 (GMT) Received: from smtpav06.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C4D858055; Tue, 11 Aug 2026 14:46:43 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.86.140]) by smtpav06.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Aug 2026 14:46:43 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=FxCr26HQGGPcNVJuI cyctYV5TU9dYfbvI5MmrgksQyA=; b=d9atHhDYjG0repHOJSb4pJQMIgaeYciNb NabO+r6ModH+ToWTQXn1hWEB/j7SI/62N3RA0bQl6/LB8HJeYcAa4CekJO3rdV9E PFPAxMazdM7zSEvrfK8cl9ZXlPE6zXbFQLu0MIlzPFhuREza2+mCmqqzB1vcm1q2 NJYdFnHe03XNV/YGe4iz9TTby2qWohHET92gOJDaEmiT5bmMCgfD19rIHMFLqrWR 9vfsZ2klNmjwgLJ4buvaiD6gRSblWux+20riWkr7R2q9H60GemkBlsllx1rn55H5 v6MhFYY+gXM1SFRfuY62qwJKm29D5jVYRt41NUQiKF3o39F12z+Xw== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: farman@linux.ibm.com, jrossi@linux.ibm.com, zycai@linux.ibm.com Subject: [PATCH v2 8/8] tests/qtest: Add s390x PCI SCSI fallback test to cdrom-test.c Date: Tue, 11 Aug 2026 10:46:29 -0400 Message-ID: <20260811144629.866641-9-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260811144629.866641-1-jrossi@linux.ibm.com> References: <20260811144629.866641-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=AMtp2X5w c=1 sm=1 tr=0 ts=6a7b35d5 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=MvDj_lKWWGcuVSP3geIA:9 X-Proofpoint-GUID: 7Out4OhClajwtlDLKuI6sDqQTVsbCH5n X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX6iRqt/2W319b fqHP12f1VHug4Kc3rlmnSrCoM0kfTj2pRTRdEvck3WfInZH4/yYiFMjiQooDtuCnafdf9Ax8rQP Gxq35ipe4QjjPFuzb4flpHHWuZhavekwglIbkzuGrrHDdyu59ZZIYefiCksyqJtrmIWrc8jjRFI /zzqUW8v151jaRyykxOwt6nd4TpwgWoJY5CsZslwPVFfMwhA9xe4w12QTRQ8Pb2WaDvnfnmZate q60T+WerapWHNyZRtYcJxXB5bmMtpdlt5oJ01YF24aR+KYD9tGmWpHmmcfSk76hsKQBwHwGE3uO rkMPDyIvx4G1O8VLGLJBJTi8iOMv3NI0tq9EkiJFkDsYbJNCThKSBCyVcI89pT5lGo152zXVAmm x+rOur6qkc13QKeKu6t8q3LN1Ef3R3p9cgZRQukEY3/DJM0G3kguRfgaonpg+j5jLdUmz6ij9Bp nUb5hoZXPOxl6j+wayg== X-Proofpoint-ORIG-GUID: 7Out4OhClajwtlDLKuI6sDqQTVsbCH5n X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDEyMSBTYWx0ZWRfX+gyJvDXPWEWF 6zy1PktN9oQRrrZM1hQGr/vfzrRuPYwde2Li63y84cKJkQ0canlaa9N3zCZ/vLS2vB6hqVTo8nL usbV8tD/K1RkImnO020Csy1NuSDbVRE= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-11_03,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110121 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=lists1p.gnu.org; Received-SPF: pass client-ip=148.163.158.5; envelope-from=jrossi@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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 @ibm.com) X-ZM-MESSAGEID: 1786459631307158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi Add a test to verify that a guest can use a PCI controlled CD as a fallback= boot device after a failed CCW IPL. Signed-off-by: Jared Rossi --- tests/qtest/cdrom-test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c index a65854d2bc..ab34930404 100644 --- a/tests/qtest/cdrom-test.c +++ b/tests/qtest/cdrom-test.c @@ -253,6 +253,14 @@ static void add_s390x_tests(void) "-drive if=3Dnone,id=3Dd1,media=3Dcdrom,file= =3D", test_cdboot); } + if (qtest_has_device("virtio-scsi-pci")) { + qtest_add_data_func("cdrom/boot/pci-scsi-fallback-from-blk-ccw", + "-device virtio-scsi-pci -device virtio-serial= " + "-device virtio-blk-ccw,drive=3Dd1,bootindex= =3D1 " + "-drive driver=3Dnull-co,read-zeroes=3Don,if= =3Dnone,id=3Dd1 " + "-device scsi-cd,drive=3Dd2,bootindex=3D2 " + "-drive if=3Dnone,id=3Dd2,media=3Dcdrom,file= =3D", test_cdboot); + } } =20 int main(int argc, char **argv) --=20 2.54.0