From nobody Sun Jul 26 12:31:22 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=1782174405; cv=none; d=zohomail.com; s=zohoarc; b=eYhNer6lOqjsNsT8S12KAoTjlu0V2i6/VLURGI1KhQW6bUIueb6QemVmtl3/ZFoiVcQrs6UmhrPR53gsQCSHpjUdgpivBEMblYlUZ7JP8RveQdgt22QTIPt28DSJ7XkVdnm3ruI/tlW45U5Eu1iTKH5xmY/ZmjhNhv4lxPLcLv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782174405; 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=xfgv5ZGMvcU9x2RFr+qrcJYF1DnVLW/79moXRLhEO7U=; b=GeOkFPICWrVB0MZl7bDqpvI1d0lDrKpIXUbRfsmiYE5fpVPfjFeXM8rE+LgnKm6uERfVAtTE6cXCXUkOVzc1sC+pv5FWH/dLrlZ5nL7NM2skwK34j86Crs+2gpQKwuYCkdLw1aOXT/mg3FmEzBISgeG7Kom189ahtFIx9ge/qLU= 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 1782174405198795.7068975421581; Mon, 22 Jun 2026 17:26:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wboxc-0000Df-K1; Mon, 22 Jun 2026 20:25:52 -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 1wboxb-0000C9-I3; Mon, 22 Jun 2026 20:25:51 -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 1wboxZ-0003aJ-3K; Mon, 22 Jun 2026 20:25:51 -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 65MJmGOS3990942; Tue, 23 Jun 2026 00:25:47 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 4ewjc3bxy9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:46 +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 65N0JfG3024620; Tue, 23 Jun 2026 00:25:46 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4ex7dg0h4f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:46 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65N0PiN324511188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2026 00:25:45 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D3EC358053; Tue, 23 Jun 2026 00:25:44 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DA9DF5805D; Tue, 23 Jun 2026 00:25:43 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.116.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jun 2026 00:25: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=xfgv5ZGMvcU9x2RFr +qrcJYF1DnVLW/79moXRLhEO7U=; b=NFgS0yUpC39fJ1dFB8iCsUghRZTECxjnd 8Kg4jGx5FgOq8NR/w4a64Y9Be6u3zsR0txhqneh8pMNyROHpGJ5PSFgUICWF42MC esJzegSRvpluY8+hD9N4FtfSKB/kaf0bwsmQ2OkxjMMLQN+8hAEP2BqtjCJXu15D CZPuJdAfi70sBwwNO3ikgFK8MxuWPhCFkZL39tcJAWoSqzYNeYXbwzGq6jZLZgEB mWxxdcb3Cw3eUQc9/DIlZn/hTNfapeg3ZiuYO3NgJQX8omxVCpGAlHagbAQPPtoR xfKJKQh2h3zBL7/S2Uu3k2d0prPy2w5sYJG3//YxYDkaqydFHoEAw== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: jrossi@linux.ibm.com, zycai@linux.ibm.com, jdaley@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, nrb@linux.ibm.com Subject: [PATCH 1/5] pc-bios/s390-ccw: Refactor byte swapping Date: Mon, 22 Jun 2026 20:25:35 -0400 Message-ID: <20260623002539.126124-2-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260623002539.126124-1-jrossi@linux.ibm.com> References: <20260623002539.126124-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=X4Ni7mTe c=1 sm=1 tr=0 ts=6a39d28a cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=Mh-7s8SilpXd35hLZrsA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfX9owW/76WuTeL b56eJKvxqPs+t59QrjaaEmyywh/vxfN7daM/fB+lNUbqDFfuPuRWeMTxqCSaLA36fNMpKY1za5b ZfTlLacq1/1H9WqGH4tioFchKBzW89Q= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfX0p86FkAen+GS ZogQ5Q5xpV9CgrasJuJhhhrmdeCeWds10oGNjpgDIFrklZvTikUuIlTuwhB6Te3JCfJ1a7nBgjm DuwcrNbOktq4dTmqEODO/yqJGTIp6SxDe2baJmoF7ChVV/tdZko0Rs6weE+dIiBlDyZM3eOkCVk WbV7iAxBRid6lcKlPntlTxtjvKOuKR3EnMN9JUrjGJuJTJpSvhsqMpxhdJMZNCuOhwlx1txjviF lOwSL642uarxU9L65f5SKHWWtUVdr9kqUOMgFayWXsS18ku28zlzu4UtB79BSFHV2GDLNdOgI1b zPuZobkRH5glYBXscyRTfwzGLSdfV8aVCOfH6HElzRMhBhzlHtWjcHXhg48kUFl0IDwqVfLtKAS tKufZNlN9X8YwCaFvDUeBe2dVdkW+cIKqa6DyhTyyiYJAMOjRjaxK3BQh40B15FRKyarxI3FFvd wRy4pISjTcQfdBj7flA== X-Proofpoint-ORIG-GUID: 6pU86svbHrQdXtvsllFrw8CP6UjKifcT X-Proofpoint-GUID: 6pU86svbHrQdXtvsllFrw8CP6UjKifcT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230000 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: 1782174406510158500 Content-Type: text/plain; charset="utf-8" From: Zhuoying Cai Introduce local variables to cache the byte-swapped values eliminating some redundant byte swap operations. Additionally, do byte swap when polling to avoid a special case where endianness is preserved. Signed-off-by: Zhuoying Cai Signed-off-by: Jared Rossi Reviewed-by: Eric Farman --- pc-bios/s390-ccw/virtio.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 390b55c7b9..a448dc96e2 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -153,14 +153,14 @@ static void vr_bswap_descriptor(VRingDesc *desc) =20 void vring_send_buf(VRing *vr, void *p, int len, int flags) { - if (!be_ipl()) { - vr->avail->idx =3D bswap16(vr->avail->idx); - } + uint16_t avail_idx; + + avail_idx =3D be_ipl() ? vr->avail->idx : bswap16(vr->avail->idx); =20 /* For follow-up chains we need to keep the first entry point */ if (!(flags & VRING_HIDDEN_IS_CHAIN)) { - vr->avail->ring[vr->avail->idx % vr->num] =3D be_ipl() ? vr->next_= idx : - bswap16(vr-= >next_idx); + vr->avail->ring[avail_idx % vr->num] =3D be_ipl() ? vr->next_idx : + bswap16(vr->next= _idx); } =20 vr->desc[vr->next_idx].addr =3D (unsigned long)p; @@ -177,23 +177,23 @@ void vring_send_buf(VRing *vr, void *p, int len, int = flags) =20 /* Chains only have a single ID */ if (!(flags & VRING_DESC_F_NEXT)) { - vr->avail->idx++; - } - - if (!be_ipl()) { - vr->avail->idx =3D bswap16(vr->avail->idx); + avail_idx++; + vr->avail->idx =3D be_ipl() ? avail_idx : bswap16(avail_idx); } } =20 int vr_poll(VRing *vr) { - if (vr->used->idx =3D=3D vr->used_idx) { + uint16_t used_idx; + + used_idx =3D be_ipl() ? vr->used->idx : bswap16(vr->used->idx); + if (used_idx =3D=3D vr->used_idx) { vring_notify(vr); yield(); return 0; } =20 - vr->used_idx =3D vr->used->idx; /* Endianness is preserved */ + vr->used_idx =3D used_idx; vr->next_idx =3D 0; vr->desc[0].len =3D 0; vr->desc[0].flags =3D 0; --=20 2.54.0 From nobody Sun Jul 26 12:31:22 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=1782174410; cv=none; d=zohomail.com; s=zohoarc; b=m7g/p2qVM/xDwfip4j4hsX66GJnasHwKJShj0tzQLgT15D2e+F2Y+DXjwlfyASL8pipC9njFFwgDj9vp7rncBXj6JsdlFHYdZA51HjZjgaTsqc00hEftIdPZI+LQ+OH0ad6bfOnd654n10P+hsEIF/R291aCQ98kfPyPtuN3XTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782174410; 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=69RnOsQUdTly/FXF41vQrPFeDbis0AV+JFsSzfKVpcc=; b=aRblW1fMyuZpzEdRI7YpTTIqsYdp5fIsHG9suaXa9Z0yI5q+mBLMjlPWncsoN9AgAl0o9OX6leJYHs/MMUXF4Y/MYUvc3a4ohB4TixTRx1vu+khI7K3/71btVckjtHdSHVGDLMye3zCsHGWoq+Y583k/fqRFH1e4iRlsSe8Vs2A= 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 1782174409764109.5896456950345; Mon, 22 Jun 2026 17:26:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wboxf-0000ID-6P; Mon, 22 Jun 2026 20:25:55 -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 1wboxc-0000Dg-J2; Mon, 22 Jun 2026 20:25:52 -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 1wboxa-0003bL-Np; Mon, 22 Jun 2026 20:25:52 -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 65MJng0c3936483; Tue, 23 Jun 2026 00:25:49 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 4ewh9gbxce-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:49 +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 65N0JfDX016633; Tue, 23 Jun 2026 00:25:48 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ex6ph8nym-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:48 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65N0PlpX24117936 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2026 00:25:47 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E005658043; Tue, 23 Jun 2026 00:25:46 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E5F8A58053; Tue, 23 Jun 2026 00:25:45 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.116.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jun 2026 00:25:45 +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=69RnOsQUdTly/FXF4 1vQrPFeDbis0AV+JFsSzfKVpcc=; b=B8Y7V679+cOB9IrhpGxTe4AgzAMFyX7gU 3BiM41moW4LbX7qk2p8ftTnardvpt2B58F0yqm9s+76eud9cYKeEIP0Yxy98xBVL sAlYvgiPkRuLucf90CG7dj0TJZp8m8xVmSMD4807jD7bJzZ70P/wu/QWoTh8Zdrk Km78UIO5kcDy5YrgrVGihzBSYdct3K/9bsEiT4GRATaAt7RhPdyFRSeakQJZo4V6 WmPCh0hnBwD5JsJ+ZBjbQAORI7AqrKR318xc7d4W0yDNy5UaZMHciFhwhcxHOyNF 6lMoHPFz/MVQ3aRxVOBY5nHbmskclb/CCfRJ3GF2isuqL67m9dLRA== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: jrossi@linux.ibm.com, zycai@linux.ibm.com, jdaley@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, nrb@linux.ibm.com Subject: [PATCH 2/5] pc-bios/s390-ccw: Add per-queue notification offset for multi-queue virtio configurations Date: Mon, 22 Jun 2026 20:25:36 -0400 Message-ID: <20260623002539.126124-3-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260623002539.126124-1-jrossi@linux.ibm.com> References: <20260623002539.126124-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: iKBjkNpV0mOfgj9AbJQe1yejLOTvLTnF X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfXwSWx49O85gDV qPVtIbeoZwpiPNigmAMucsZyaJS7KEpVuYb9GkVmrKQ1957nPG4UpY4kFssdRSCFlPf8+mE3Tu9 FisiRftkv0CndewwNucgYL/x36Toqkk= X-Authority-Analysis: v=2.4 cv=c62bhx9l c=1 sm=1 tr=0 ts=6a39d28d cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=J-uy_QIm2an7eANbOmAA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfXyZ+AQxWP4hSW MkIJgi8AF23GRGaRuFgXRPAU8ilvtdar+J92BDtZTTKkgZllecbARCk5/MtMMDxg5UrP7/gtnFw vI63ujV2ojA3XRSmLACYqUIiQIQ5DqOSY00PevgH5lfsHTdahMGiEW9IGH5CN3brYS7FZB2v7SW /l2vggfN3rulHUKCTDEh2qoxYEHkBj9sWMTHdnElfcCYsIwa5RbkOHfisZy1HW9bq0q8R/doh0W 7e3rRhtxSAetU7ZChJcPb1vbUbPM5jC7GAKIOGjVWrbHrgNxPiKMio3Esn3Mff5FiNC9p0nbvtj 96MZ8emBardL8kelkH6j7i9KgUdrwZ67CgXO7ljmgtw+uUkNW+NCCwKg6CglJ6KIuP2B+WK6HM6 HcX+0nevGZu68FChKMsKV/ZCEW2eb5bkazy/GsRi3uJXvmXHv1eCr9/D0gHt4/OK4Jf6T7Bl5CI nFUByhsseex5jA/hsNw== X-Proofpoint-ORIG-GUID: iKBjkNpV0mOfgj9AbJQe1yejLOTvLTnF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 adultscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 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-2606230000 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: 1782174410822158500 Content-Type: text/plain; charset="utf-8" From: Zhuoying Cai The initial support for virtio-blk-pci IPL devices used a single virt-queue= , but other device types require multiple queues, and for PCI device types this a= lso requires a per-queue notification offset. Add a PCI notify field to the VRing struct so that each queue has a unique notify offset as defined in the virtio spec. Signed-off-by: Zhuoying Cai Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/virtio-pci.c | 38 +++++++++++++++++++++-------------- pc-bios/s390-ccw/virtio-pci.h | 2 +- pc-bios/s390-ccw/virtio.c | 3 ++- pc-bios/s390-ccw/virtio.h | 1 + 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/pc-bios/s390-ccw/virtio-pci.c b/pc-bios/s390-ccw/virtio-pci.c index 53bdb52e76..2c83ec4f13 100644 --- a/pc-bios/s390-ccw/virtio-pci.c +++ b/pc-bios/s390-ccw/virtio-pci.c @@ -21,7 +21,6 @@ VirtioPciCap c_cap; /* Common capabilities */ VirtioPciCap d_cap; /* Device capabilities */ VirtioPciCap n_cap; /* Notify capabilities */ uint32_t notify_mult; -uint16_t q_notify_offset; =20 static int virtio_pci_set_status(uint8_t status) { @@ -74,10 +73,10 @@ int virtio_pci_reset(VDev *vdev) return 0; } =20 -long virtio_pci_notify(int vq_id) +long virtio_pci_notify(VRing *vr) { - uint32_t offset =3D n_cap.off + notify_mult * q_notify_offset; - return vpci_bswap16_write(offset, n_cap.bar, (uint16_t) vq_id); + uint32_t offset =3D n_cap.off + notify_mult * vr->pci_notify; + return vpci_bswap16_write(offset, n_cap.bar, (uint16_t) vr->id); } =20 /* @@ -301,8 +300,7 @@ static int virtio_pci_read_pci_cap_config(void) } =20 rc =3D vpci_read_bswap32(pos + VPCI_N_CAP_MULT, PCI_CFGBAR, ¬ify_mu= lt); - if (rc || vpci_read_bswap16(c_cap.off + VPCI_C_OFFSET_Q_NOFF, c_cap.ba= r, - &q_notify_offset)) { + if (rc) { puts("Failed to read notification queue configuration"); return -EIO; } @@ -332,7 +330,6 @@ int virtio_pci_setup(VDev *vdev) VRing *vr; int rc; uint8_t status; - uint16_t vq_size; int i =3D 0; =20 vdev->guessed_disk_nature =3D VIRTIO_GDN_NONE; @@ -380,28 +377,39 @@ int virtio_pci_setup(VDev *vdev) return -EIO; } =20 - if (vpci_read_bswap16(VPCI_C_OFFSET_Q_SIZE, c_cap.bar, &vq_size)) { - puts("Failed to read virt-queue configuration"); - return -EIO; - } - /* Configure virt-queues for pci */ for (i =3D 0; i < vdev->nr_vqs; i++) { + uint16_t vq_size; + uint16_t vq_notify; VqInfo info =3D { .queue =3D (unsigned long long) virtio_get_ring_area(i), .align =3D KVM_S390_VIRTIO_RING_ALIGN, .index =3D i, - .num =3D vq_size, + .num =3D 0, }; =20 vr =3D &vdev->vrings[i]; - vring_init(vr, &info); =20 - if (vpci_set_selected_vq(vr->id)) { + if (vpci_set_selected_vq(i)) { puts("Failed to set selected virt-queue"); return -EIO; } =20 + if (vpci_read_bswap16(c_cap.off + VPCI_C_OFFSET_Q_SIZE, c_cap.bar,= &vq_size)) { + printf("Failed to read virt-queue %d size\n", i); + return -EIO; + } + + info.num =3D vq_size; + + if (vpci_read_bswap16(c_cap.off + VPCI_C_OFFSET_Q_NOFF, c_cap.bar,= &vq_notify)) { + printf("Failed to read virt-queue %d notify offset\n", i); + return -EIO; + } + + vr->pci_notify =3D vq_notify; + vring_init(vr, &info); + rc =3D set_pci_vq_addr(VPCI_C_OFFSET_Q_DESCLO, vr->desc); rc |=3D set_pci_vq_addr(VPCI_C_OFFSET_Q_AVAILLO, vr->avail); rc |=3D set_pci_vq_addr(VPCI_C_OFFSET_Q_USEDLO, vr->used); diff --git a/pc-bios/s390-ccw/virtio-pci.h b/pc-bios/s390-ccw/virtio-pci.h index 90d07cb9a7..2494df1619 100644 --- a/pc-bios/s390-ccw/virtio-pci.h +++ b/pc-bios/s390-ccw/virtio-pci.h @@ -64,7 +64,7 @@ typedef struct VirtioPciCap VirtioPciCap; =20 void virtio_pci_id2type(VDev *vdev, uint16_t device_id); int virtio_pci_reset(VDev *vdev); -long virtio_pci_notify(int vq_id); +long virtio_pci_notify(VRing *vr); int virtio_pci_setup(VDev *vdev); int virtio_pci_setup_device(void); =20 diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index a448dc96e2..df04479aa6 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -114,7 +114,8 @@ bool vring_notify(VRing *vr) vr->cookie =3D virtio_ccw_notify(vdev.schid, vr->id, vr->cookie); break; case S390_IPL_TYPE_PCI: - vr->cookie =3D virtio_pci_notify(vr->id); + vr->cookie =3D virtio_pci_notify(vr); + break; default: return 1; } diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index d32a4830ca..75ae5bdbc2 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -107,6 +107,7 @@ struct VRing { VRingUsed *used; long cookie; int id; + uint16_t pci_notify; }; typedef struct VRing VRing; =20 --=20 2.54.0 From nobody Sun Jul 26 12:31:22 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=1782174408; cv=none; d=zohomail.com; s=zohoarc; b=FfJ+eQ3qewSFDfpOIWypFS5lngv9lJlWKW/USdhOcK+Ba+B9KSb1R6i0mIX5SGGhS5jVKbNcBE/ZlC3OMDeJlWad66pn9ku2SP03vEsDIl0juK7rjI3FjcgoReXMS4vkE8I/J/69idCp1h2FoHeaUKtqz6QCdnVsCucGaXWw43o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782174408; 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=oCHY057HD1t7itucA0Z6jljDaCq/K++NJlo4B3KASU4=; b=bMGzvhAzmtOy77FKVHh036uufsPbxQ05RN06ecYt5z8e4JuDxeduJXWNsiz3n7n4+1e+DPBJJAe4MAejg6/JPOSBuOkefcv8/ocSGLs/h0TwT1n0IZM1MtdTORUKyoqfygY/icdarvBFHR1OTi7Z2m/Uu5nTRyGHHBV2mlowPho= 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 1782174408194516.0877117756538; Mon, 22 Jun 2026 17:26:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wboxf-0000JC-Nq; Mon, 22 Jun 2026 20:25:55 -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 1wboxe-0000HA-KO; Mon, 22 Jun 2026 20:25:54 -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 1wboxd-0003by-0i; Mon, 22 Jun 2026 20:25:54 -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 65MJmF5T3990916; Tue, 23 Jun 2026 00:25:51 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 4ewjc3bxye-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:51 +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 65N0JoCh016683; Tue, 23 Jun 2026 00:25:50 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ex6ph8nyr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:50 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65N0PmAK66585024 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2026 00:25:49 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D584758065; Tue, 23 Jun 2026 00:25:48 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BE44858053; Tue, 23 Jun 2026 00:25:47 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.116.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jun 2026 00:25:47 +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=oCHY057HD1t7itucA 0Z6jljDaCq/K++NJlo4B3KASU4=; b=JofgXcqCmcsXGXuCHHKS7gF/STdwcLrOU oP4jkjnI1sayrzLdCJ0j+lRp4XnCUD4/uDwwfUjgWtfZmLAA6/bOUzmkk62EXiXg dsdE3Le+goJCpNIW41qHHWaEVFbZ6E6z9mzGDx7Htby/at2XFIao/xDvdKw8xOep p8LKvNikDzN0dSmuVAIPYeWNNXGNesuTcESi2SHB7+Q6VfUdlP3aVfxYhk45BpHM dNi6krBgApUeRXm6fGh8P1EuyHgVSDUlBznTw0YWne72f1Xn4ZzW1ee/P1QQhPvV 4iQuL512Ye/e5/cd79sGu7zExJ1oeNXuSVUITR6GIuO8wTgqgNJwA== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: jrossi@linux.ibm.com, zycai@linux.ibm.com, jdaley@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, nrb@linux.ibm.com, Jared Rossi Subject: [PATCH 3/5] pc-bios/s390-ccw: write IPLB location for virtio-blk-pci IPL Date: Mon, 22 Jun 2026 20:25:37 -0400 Message-ID: <20260623002539.126124-4-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260623002539.126124-1-jrossi@linux.ibm.com> References: <20260623002539.126124-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=X4Ni7mTe c=1 sm=1 tr=0 ts=6a39d28f cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=IniV-qTpWqY4UDjBtQYA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfX4B7sO5r/CCu9 823o9g0wmS0B+6+aQNVoqyZGUq/YiqgLjZDkxB1OHzIV7ONQ7Yjk+BOykJMQGArht+kaoqT/Izv bbocek+NigfPC7zU1zYqIQeUO2I8gSk= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfX9sjKhD4qnIz0 uBTSd+3GuKP05YieW31TYh+hk9qvMqdbO/K9pYOVeDjZJ/NhYimKHjdSYTx9NeEFF5GWzzOUXw1 vFzlhASrI9GJDb0gUJyUQtyo9Ml9UM1pxN65KNxffpXLEO4O5EijOG303j9M519EsSEQMZiwAZH U9bqGz0PI40bgPXpjVLvyN/b9B4lmFOn/3KRX5TQX1/uENHXaQkmxc27giSfcXjVqCF1ubEwS3T JPz0bl75pm/hjpP86BFnfQFjIPF+748cOCNKgjqvy5eV6J+Y1BU+hBb05YbxzpJVYnuoxQ66Prj ZMdO1f4zWKoVcEql5uxiF78H0enG2DNhLrZIotGi75pDcNetE/dz7Wv4OCmA6vL/c9B+f0Zw4yl N4d2/jdIYj55tOhHWvocjO3zRSZe8pbNyVm720rK+lUbtcrv9MWQf7Adba+0ghvYa68n17YfMOb eCUlCL7V1qp9ig1dzTw== X-Proofpoint-ORIG-GUID: Itg1zi4g-85w3ObZjFfFVL6BJRL7Wd5i X-Proofpoint-GUID: Itg1zi4g-85w3ObZjFfFVL6BJRL7Wd5i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 suspectscore=0 spamscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 clxscore=1015 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230000 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: 1782174408489158500 Content-Type: text/plain; charset="utf-8" From: Joshua Daley When IPL type is PCI, cutype is unknown, so the IPLB location does not get written to lowcore. Update the condition to check IPL type as well. Signed-off-by: Joshua Daley signed-off-by: Jared Rossi --- pc-bios/s390-ccw/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 26287cfd81..1059fda03c 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -52,7 +52,8 @@ void write_subsystem_identification(void) =20 void write_iplb_location(void) { - if (cutype =3D=3D CU_TYPE_VIRTIO && virtio_get_device_type() !=3D VIRT= IO_ID_NET) { + if ((cutype =3D=3D CU_TYPE_VIRTIO || iplb.pbt =3D=3D S390_IPL_TYPE_PCI= ) && + virtio_get_device_type() !=3D VIRTIO_ID_NET) { lowcore->ptr_iplb =3D ptr2u32(&iplb); } } --=20 2.54.0 From nobody Sun Jul 26 12:31:22 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=1782174398; cv=none; d=zohomail.com; s=zohoarc; b=hYzRoyKRMjX5sAxj0IjJwANz1FfpuzFsWMz3AN2e91+bq3G8w8JLnm3eRZhQw+ipJ1o2Ca7YPUpKsAqp1AapcgDOODLpfydDwvj4TspQ4Km3nT5w93SQzRVNav/b0k4HhmvFoQs+dlnZM7QFo8CPobll8Uj5FJwt5dtJEvZ2HQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782174398; 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=m3QQnMA1J67/ZsLf6nhOOi5kLhoE1ut6ZAqrtdZ5+Q0=; b=ZiVtBJRIFFKQa/TvOOeuXzWiLt1DkneIexa2/P0Ax7SHG/trko9nDIbdvZSck/IBpN/6nVE6tByg2CEM8OXd6Mwg40q7XeLucgrobHW+TkrLxG7bo4Becx48CZ89hV5PJxQ7nODszJxi3RsfN9Txt+atJAoJqPcq9F/0VvmlI2Y= 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 1782174398482562.1404629477346; Mon, 22 Jun 2026 17:26:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wboxg-0000Kv-T6; Mon, 22 Jun 2026 20:25:56 -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 1wboxf-0000JF-MF; Mon, 22 Jun 2026 20:25:55 -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 1wboxe-0003cK-2o; Mon, 22 Jun 2026 20:25:55 -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 65MJmU393896350; Tue, 23 Jun 2026 00:25:52 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 4ewg9hm62s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:52 +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 65N0Jeo2007306; Tue, 23 Jun 2026 00:25:51 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4ex5jw8utx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:51 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65N0PIC014549638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2026 00:25:18 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AC4BF58053; Tue, 23 Jun 2026 00:25:50 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B1C7E58043; Tue, 23 Jun 2026 00:25:49 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.116.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jun 2026 00:25:49 +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=m3QQnMA1J67/ZsLf6 nhOOi5kLhoE1ut6ZAqrtdZ5+Q0=; b=jqcG0cJ5GDjf0n7mYAY6ZsaOXi3SbKdpE 9TuSvpwIYHUayKfmiFtgQm8rtxO9d+6XkEbs6rMYap9Nvkx7SFAGGVMcSkYhwEZx WjM+QZlwTdwi7qE1rbWVjmV9xyOasemZYkQwGmlDxQrMg37q02JtTJZEpHl+J64/ wMTnc5+E/d2MSpwjadJoJXk6vCKNOuKcuFTOJVtpwORt6Vv4mLRoCYdY86T7mT+R 693j78omnZv5lrCNciAg/cqpt6Nvr1WQ8FapYWAKqjab6rjwl1U/bxEPFTuGNmQ5 /uG1MuOQVq4vtADPl8/Z1vmUP/rNOtFE49L3XnECG7cmgIBbvIyxg== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: jrossi@linux.ibm.com, zycai@linux.ibm.com, jdaley@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, nrb@linux.ibm.com Subject: [PATCH 4/5] pc-bios/s390-ccw: Verify virtio support when booting from PCI device on s390x Date: Mon, 22 Jun 2026 20:25:38 -0400 Message-ID: <20260623002539.126124-5-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260623002539.126124-1-jrossi@linux.ibm.com> References: <20260623002539.126124-1-jrossi@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: -v75l5OQYMvbByB68aH758FXzIINdSiT X-Proofpoint-GUID: -v75l5OQYMvbByB68aH758FXzIINdSiT X-Authority-Analysis: v=2.4 cv=Y4XIdBeN c=1 sm=1 tr=0 ts=6a39d290 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=vycScq5fQBvcvulrpfcA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfXwB+l4lV/VKBv f57X0MDvQRwNPzh3sOC0xarAbegErRvT9biiCvRScF+8N8xvYo7wIzhV1rgNqEusUqKPrhnoeld dVrXlEkQF8xuIPToO1fwT2e3srZfn89G8Iq/ppko8VLt2f8k8X3XQ6ox80/iFPu2Q9AySIP+SLG t1UeDR4DJbLtEktdM0prn0Nq5DujpVswFhT/lMbhsdaV3d1P5TIot75t4/mmdY6jgXQJZWrsQyA n3aRC6sGX42ug42CMyPW2bC/cI9QDCAltJtc0vpP/2oOa4wEjp64G6AmkIciJFT2RgXhn2aJTUn ZJvV8diiw4tZ4ujHI14hLYDbsp0lT932FuXHyDCDvb0Up5lWWOyl//m3j9UaUsM3WZUTpMeVvOd hNEmCFkOywAlldVjd2+93BtEVPZrKe8CztlOrnQBgwjTGDFQd8iK3gVx+16AA2Y5ZXIgUVNRDov ZDPcE7fsLOGSqfT5daA== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfXwXmO+GSRq1g/ dQqGTi2ET+i/n6LStqN5EpmfVE3Ju5ooc/U9UEcB8ZUg/5kgTvGB6pEldTVpmY/lU/2Yyg73nhM PB37PogwlUUTapItX3fV2GgHDwmnMVk= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 suspectscore=0 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-2606230000 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: 1782174400578158500 Content-Type: text/plain; charset="utf-8" From: Jared Rossi The virtio specification requires that each PCI device has a vendor ID of 0x1AF4. Verify this value before continuing with boot process. Signed-off-by: Jared Rossi --- pc-bios/s390-ccw/main.c | 1 + pc-bios/s390-ccw/virtio-pci.c | 19 +++++++++++++++++++ pc-bios/s390-ccw/virtio.h | 1 + 3 files changed, 21 insertions(+) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 1059fda03c..567e97bf32 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -164,6 +164,7 @@ static bool find_fid(uint32_t fid) } =20 vdev->pci_fh =3D entry.fh; + vdev->vendor_id =3D entry.vendor_id; virtio_pci_id2type(vdev, entry.device_id); =20 return vdev->dev_type !=3D 0; diff --git a/pc-bios/s390-ccw/virtio-pci.c b/pc-bios/s390-ccw/virtio-pci.c index 2c83ec4f13..07b53b894f 100644 --- a/pc-bios/s390-ccw/virtio-pci.c +++ b/pc-bios/s390-ccw/virtio-pci.c @@ -325,6 +325,20 @@ static int enable_pci_bus_master(void) return 0; } =20 +bool virtio_pci_is_supported(VDev *vdev) +{ + if (vdev->vendor_id =3D=3D 0x1AF4) { + switch (vdev->dev_type) { + case VIRTIO_ID_BLOCK: + return true; + default: + return false; + } + } + + return false; +} + int virtio_pci_setup(VDev *vdev) { VRing *vr; @@ -335,6 +349,11 @@ int virtio_pci_setup(VDev *vdev) vdev->guessed_disk_nature =3D VIRTIO_GDN_NONE; vdev->cmd_vr_idx =3D 0; =20 + if (!virtio_pci_is_supported(vdev)) { + puts("Virtio PCI unsupported for this device ID"); + return -ENODEV; + } + if (virtio_pci_read_pci_cap_config()) { puts("Invalid virtio PCI capabilities"); return -EIO; diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index 75ae5bdbc2..aa307025e0 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -259,6 +259,7 @@ struct VDev { bool scsi_device_selected; ScsiDevice selected_scsi_device; uint32_t pci_fh; + uint16_t vendor_id; uint32_t max_transfer; uint32_t guest_features[2]; }; --=20 2.54.0 From nobody Sun Jul 26 12:31:22 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=1782174399; cv=none; d=zohomail.com; s=zohoarc; b=SMCcYlm9wVyvxC/SP95KoXTPMLIPInzLuZG3nvUn3REuERQzSjncckaoC6vkuiz3KO/yqyIcj5qBUDN02VFYZ3N4GjtIgSlrRphO7xxMO5EEy57iCWVtQQg2NUMF+fSzt+1RVB3gidneyNt0ZrF9bTcGnDlC74/T8AMihP4pijc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1782174399; 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=zhSKiO/IHmLzfM3DoEVL6G2Q8QWGd7wtlJTGHm8RXHA=; b=DlQuoNvygSQaladCe2UwNpb/ZrytIES8BRbDr2hPzlAi5MGnGBGVhIvIiB8cMs1kzizlVOtb8DQyJiNVrNJ++AoB/BPw6Bl/1dkI2SU0ufni3yMxOJpTB4S3jGSl1uroU5qOOCrGuNxq4Gj5Xroh6RYs1QsPIw2+RQxrIewKzYs= 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 1782174399422257.0659412041696; Mon, 22 Jun 2026 17:26:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wboxj-0000MC-BI; Mon, 22 Jun 2026 20:25:59 -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 1wboxi-0000Lc-An; Mon, 22 Jun 2026 20:25:58 -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 1wboxg-0003d6-Q2; Mon, 22 Jun 2026 20:25:58 -0400 Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65MJmCq74133428; Tue, 23 Jun 2026 00:25:55 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 4ewjhqkv32-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:54 +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 65N0JdtI024608; Tue, 23 Jun 2026 00:25:54 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4ex7dg0h4s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 23 Jun 2026 00:25:54 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (smtpav05.wdc07v.mail.ibm.com [10.39.53.232]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 65N0Pqds66322826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jun 2026 00:25:52 GMT Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8446F58059; Tue, 23 Jun 2026 00:25:52 +0000 (GMT) Received: from smtpav05.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7085B58043; Tue, 23 Jun 2026 00:25:51 +0000 (GMT) Received: from t15.ibmuc.com (unknown [9.61.116.241]) by smtpav05.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 23 Jun 2026 00:25:51 +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=zhSKiO/IHmLzfM3Do EVL6G2Q8QWGd7wtlJTGHm8RXHA=; b=L6VI3vl1e47PL2nMr7N7ttGA+arjdPM0g 590knbf1NwuH3P13HHq6kQmsxunYh0IZeIK/8j3XHUNvC9lcr3ewKBFXGriw+7jj mKrTVIY1xuQSu2aCR2yqEh3Xg1iKA8o8p950INN1l8jaYW/v7YCsP87We9zrZ1vf MlnGTOkNMOq73RO2qGiKO2En0ciePcDrmtwkiIUtTwIyQPzvKHb8haOxPfrqxOxP 94byqUFLyQIT654wsErSUonY285+S9TirxvNZqUE739OUfr0ckXj3+B3s6WzPNxL cbsXylD23U4rLmkWtDjbovvG6RHfBiKf8Eqa6Yd/FpQjtCu0z0UDw== From: jrossi@linux.ibm.com To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: jrossi@linux.ibm.com, zycai@linux.ibm.com, jdaley@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, nrb@linux.ibm.com, Jared Rossi Subject: [PATCH 5/5] s390x: Enable boot menu for virtio pci device Date: Mon, 22 Jun 2026 20:25:39 -0400 Message-ID: <20260623002539.126124-6-jrossi@linux.ibm.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20260623002539.126124-1-jrossi@linux.ibm.com> References: <20260623002539.126124-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=I4VVgtgg c=1 sm=1 tr=0 ts=6a39d293 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=FelO9ux0wxsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=UmcbZtfwkcGgJE0Tj-oA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfXxhQbWQhd4Vi/ Euo1pPpgeWkY7gsooWLkQujMpZaVzryWT/9aOHEHEPD5SZLGYAg40o+vB8SmYYA1fxATKmfVWYq CGyhXED7WCL3FI5aMrhFTZtka0vDUAG9Dzm3EwBsNm4ryWVeF+ZkNOePB9W4W01EiBg4w6CQK89 KwmFX34pOd59TwNYBSW7omOIhrFhnEBG59ITj4kNNt1TlQpdN/3AQBthpcX4MKCLfBdUawk28Az VOBTjqLZDMmUtEQgkR+nsDPxZGV5RFQTK6PBqIS+COOfIQmfsMJDGJVLOGCqY34t8GhJ9PB73YG 5+QNZfhULXpzQ9vX9pvMHzBQXbbH/hw7YPepcNZothzzWHNbk0AMeAe8h1VTkPHX2VuvTa905av QxrLvCE6zdgnYc+7fDhdwvCTHA5CcKBtXeW4TYDYSWnFswxYm/yiFgLfjj5WBp+W7TpTWm7k2jD 4LptC5w7e/iKLaXFuIQ== X-Proofpoint-GUID: zE1bniD_9pAk3b6a3o7Rvb3AUy9gp9td X-Proofpoint-ORIG-GUID: zE1bniD_9pAk3b6a3o7Rvb3AUy9gp9td X-Proofpoint-Spam-Info: AW1haW4tMjYwNjIzMDAwMCBTYWx0ZWRfX0fYgMgl7w3Lw 6WtIhuILJarCAIfwgtgXk0jSSeEmLIV7kwcun8YScNx0DJewmSLYuAQKzrditRVaIV1Fi/VzYB3 8UC5T28C9W2kU2Fufra2e2PxxwPmnz8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-22_04,2026-06-22_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 malwarescore=0 clxscore=1015 impostorscore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606230000 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: 1782174400563158500 Content-Type: text/plain; charset="utf-8" From: Zhuoying Cai Add S390_IPL_TYPE_PCI to the boot menu handling logic to enable interactive boot menu support for virtio PCI devices on s390x. Signed-off-by: Zhuoying Cai signed-off-by: Jared Rossi Reviewed-by: Eric Farman --- hw/s390x/ipl.c | 1 + pc-bios/s390-ccw/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 4cca21c621..d5fdc3ea0f 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -315,6 +315,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) return; } break; + case S390_IPL_TYPE_PCI: case S390_IPL_TYPE_QEMU_SCSI: break; default: diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 567e97bf32..be83d598e2 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -185,6 +185,7 @@ static void menu_setup(VDev *vdev) =20 switch (vdev->ipl_type) { case S390_IPL_TYPE_CCW: + case S390_IPL_TYPE_PCI: case S390_IPL_TYPE_QEMU_SCSI: menu_set_parms(qipl.qipl_flags & BOOT_MENU_FLAG_MASK, qipl.boot_menu_timeout); --=20 2.54.0