From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D5947C5DF97 for ; Wed, 26 Aug 2026 20:30:11 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wzKFa-0001gR-Mk; Wed, 26 Aug 2026 16:29:34 -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 1wzKFZ-0001g7-Jv; Wed, 26 Aug 2026 16:29:33 -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 1wzKFY-0008Dp-0R; Wed, 26 Aug 2026 16:29:33 -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 67QH1oFT3493092; Wed, 26 Aug 2026 20:29:30 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=TnykYR IHJhLpplayGU4UY+38YjNfKOcg+jk4O8JEvNc=; b=EnnWx3xeY8F0BQFovXeQOD OqUiJ7mL9qs0OFfczZgIBF6Uu8mRsLbFQimKu8ag3ec7tRdcTB184DUXf5Gq9udz X45nfnB7udROZA+pgY8PIQeJ4B7GbdIvUByC7//lqD4CVBpDrjkSpiXjQ2FvPggN TQGIjwKFvecHojg6mcKDH2UPMjfrJW3apusZSjxKHTupaYZUE44RZJye8p9tua6d pCizuvx2Hv/yOv1JafS8rzsnONp0nz4WqaDKTi8eRPl843GFc8PWYbIaSIymkCaY FDoAeQOMW7NyOfpkJrw7Dqldn4H+Wtes6sXjUg0zk+hYGnV2Wa66MXgPsgUuJVCA == 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 4g726erye9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 20:29:30 +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 67QKQMBD008486; Wed, 26 Aug 2026 20:29:29 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4g7rsybrq8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 26 Aug 2026 20:29:29 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67QKTRHc4194818 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 26 Aug 2026 20:29:27 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7799E58060; Wed, 26 Aug 2026 20:29:27 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E95A65803F; Wed, 26 Aug 2026 20:29:26 +0000 (GMT) Received: from [9.61.145.136] (unknown [9.61.145.136]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 26 Aug 2026 20:29:26 +0000 (GMT) Message-ID: Date: Wed, 26 Aug 2026 16:29:26 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 5/8] pc-bios/s390-ccw: Abstract virtio_run() for generic use To: jrossi@linux.ibm.com, qemu-devel@nongnu.org, qemu-s390x@nongnu.org, cohuck@redhat.com, mjrosato@linux.ibm.com Cc: zycai@linux.ibm.com References: <20260811144629.866641-1-jrossi@linux.ibm.com> <20260811144629.866641-6-jrossi@linux.ibm.com> Content-Language: en-US From: Eric Farman Autocrypt: addr=farman@linux.ibm.com; keydata= xsFNBF7EiEwBEADGG0EtNKnjp+kQfEVqlqxXoBHjnaQptFpMgxNlz2GtqOujY6nzEWnybIXY 63XUTmMS/tWUf2DTbNCNoWwumGM/I2Gj1uGyMnc4Q477BQlL/e2/9MRaut11rwHsi4zmWylc jO0eFTSLFA8yFBj9osT3uZzk5TwWkD8sf+rD916fFVk0G39uYEd5sjEzjeOf9/dwXyZpjJY6 api1pUHEw7weRvOnllJAfIKFz+KoR6d7ezvMF9zOYHF73FGeSVIYoIEUhA5Cdg60rSlTtHb2 cftex3/cEapvY5bK3CKJ33BVVK10Bht9XfVaA/AOcg/3o5ZbhSIwz4xScGsEVf/Yr368YMdr 3VkCZrmN2ppmVRz/RvAmCyItnmzoVDlSREA6Faw6S0x8Oi7lN0cKh2hy9VPcVupraXJZrdAh GtdU+jrJvSbpdsrX8F7K3RwynbiqGrqC0izGla04hhtei/uwthatglukuxep4PknDGbzijg8 Ef7A8t3qEVklUDrsnNPN5HbR9QQdeF0HuWsDTfILbZv1MICfOK3BCDeT5mJWaJCoQ2rbuljM e1hFSt+mr7GV4h6NcBE+uGIqDSzQORtyTo0uBV4et3cSE84JxOfXBMrj0TlL1855JaIoPWEN uhDRB/dHW8+Fumq2du5hLcaXPka+MO26cNVKVLF0/JjwMTZ9bQARAQABzSJFcmljIEZhcm1h biA8ZmFybWFuQGxpbnV4LmlibS5jb20+wsGuBBMBCABYAhsDBwsJCAcDAgEGFQgCCQoLBBYC AwECHgECF4AdGGh0dHBzOi8va2V5c2VydmVyLnVidW50dS5jb20WIQTSxgUEyej1aM/lh7U4 J7IScb+VYgUCYel8TgAKCRA4J7IScb+VYsHAD/9BSQj7HeJf90PttOmVh35Bb4QyHLZ4g+9x waM59JCKGbiURuNRIGnoRarYXHk6vfy19v8v56Dy1IOlKWaRnizp5Mw9zXBBTCs4fgNbOzY/ SggFY2UzcziXDG29X9zznq5LgY1Jf/cwm1O+rn89GKCZWZhLEB2wKzBj7hum7NBdW+lxfVwp 2qONGDerttWDwAHxJ995k9aDJahq9kIKEMEZbrTQ8JI8KZGoox6+HA04EhoNzxvbV0J+/gLJ 2DkvxN5/xmcD3z+s8B5ev3NarOF17AIA9oCdfu8CPAupcNqJW86m19P5q6AyRB2ZLyAIAAhr HCXrnlh/8HJW1yCOVXxprFdpg1SX1fuArjbFAh53vVVDfkZlwHeTeE7+3y1rtDLfy830pqdD ymv94yey2y1+iZBdbaW0fSC/JkjkOCy8oZawkH3geM4MXV4ze4gbBH6BhxW/0gbEYjnLm3FA 53JcXwhHQFPWIYEYYPvATJi0JUiMY1Znkm3QBWDOCXSrG0tHpAclBa9L40zLRwA1h9YOMFEs qvKijUdvcDf4sTdJ+A6YL66grzul5vNt06NlqsI8HUDHE6vghqyWxupCav2+9b1BuLie++er b8OCo5n3TUHsVMjYJEePU1EkcCa84dCm+CXqPthgRv0sbe4UQEd/qUoVMdWj7Q7FL96mBn0G zM7BTQRexIhMARAAp+k1sC4y7Wtwjqtfu9wIihvY/Vot0v/sKg8CRGRIIRGLiCeA9o+2ZlxC jYztT3Leri5Vo5z09OmRMvoFLJjcHMCG5sYeZwOWNAbeuAxGkIMDSB4pLl3t2c+1PQuMBCd7 +mRZFaMEJfT3nhdUKxy2rp1+YucnA67xGXUJCiD5l9UmhPqa7SAYlpMAqDz7cmBo25c/UNm1 Tpwjrh70jq/4guV5gnprawH8nkRjdKH1JvKWvkuaB7FNZ9IuSHlWclcQX4IQMsaxsU2emAbP VYv7l4YNlKfdlJd8tuEodjuMLOBnr7e9H0hVNUWGFN9bkBNRu3zi/jvhyu15Iu4euR/WdVNu 2K2iYxIfiGMnv0F/a6R1bm10lCJrjyf23J8DYIeH4YmHvOOqYFkq3DWOctlXbb3+aABqjYt3 mkiOLXeplqbo/m3rWcGNd8Q/d1aVA0wm5+Nt3RdSuXG2FHOFdVUQKPLpf1NUH/LInBhS/9Ys ajm6tWXKv7hxwWmyz0u/th6gUra3KpARB1ypebWHULLNzKGwVS81XNs76QhXwX04cyiwLqKb WqLqJKThz+rLa09Ap+eO/UzPfFXvWYWfTeFRIQ/tKF332ZzRR8Xrh/fk//YXyRfpoE/7i5uz ve0HZWp5jXg9Yb+S6g0+XUKznnN9B8WLLCcuRIuSa722070v7KsAEQEAAcLBdgQYAQgAIAIb DBYhBNLGBQTJ6PVoz+WHtTgnshJxv5ViBQJh6XwwAAoJEDgnshJxv5Vib28P/1BYT5gvjuEB A80AXo/IqycicXxDJtrfmyw4COP7bi7AuiDcKyA1wRzC51paKwPFB8Unk2GvG4DV6aDmGTJY +GeCYgthQ+znW461S8B6GqDCAQt2VDNNFVU+gTuh7vYQOgt/OjtiiAvMIJBVRbXoNSRokKOF tpTiXf3ZOsAkot5ZmxE0TV94v18sp/bC84YvFyaxpw5bilT7bmpcq8B8/3yb0kmy6gXLcQAp OnomV3sQBmm050amiO3tvxMNv8J71AvNdTG/rojTDKUl2Nw4f+aw4nVw874m2XpEe9JGRw54 5d2dN8k3GpzcTBe9fCQPOFHOGkQ1CgptDkQuQVD3DIeNzQjXf6xehEymIKnLOkukT2smV0zh fj08z7eiv+dsmnBsbhdM6DKU8qIgkTu77TfHUKjjOY/Mj0YHPuH/J4b1AZFxBhGP0BTKiB2W CR6/49XVKvY1jHxgadSSNCD+f7tEqUNBlVl+P0emMJaYpK1+gy88ma4g3nvyOVe/VzDPjGDC 4HX/6RAR4Dbzry6/epWTTji+7ApzePzmJzPcuzD31ICsgT2dJ6ydxyxxXikBFJqx6BPOF+u+ 1BtKcTz1ek3I2sWvBM1V5CKaFw7iNXxS6HgS2scuAT2awKq+BQlt778/GfBWpXonfqixMvit y8m0x6unNti2MZIUMy0m2gcE In-Reply-To: <20260811144629.866641-6-jrossi@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=TfimcxQh c=1 sm=1 tr=0 ts=6a8f4caa cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=W57OpD53vy_E0Vtn0xEA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI2MDE2OCBTYWx0ZWRfX/J2viTwJ/IkM EZxtVWFZG/E/CUK2jaqzbnVkzR4ZXgFNOngqco26E4QnHF9JQ5hJsMwyPTK8weSUyt6Ah8SqiDO IWazP/kJxuVA8Ij7Rmoh27eAej+jru4= X-Proofpoint-GUID: inVC6GlbCoaFc_Ia6j-6vD8Kzc8Cb6s8 X-Proofpoint-ORIG-GUID: inVC6GlbCoaFc_Ia6j-6vD8Kzc8Cb6s8 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI2MDE2OCBTYWx0ZWRfX+24QIng1mo2T smTYGU2eRFJuzPcWeEvKNWyrHbS0PSQ/AxJD8kuyqy2QD/bu/2LLyVHh6FMKgHBmCtZQ85stimd eJg2USE5TghtsZBaUHlbBJzcrjbltlcHsGaDBnAjw76QHCQwMMgMhcZDx6qZTl0Xqsdw0oJ9sLw VlZRV6vjslv8pZT66+Bx4649KaZ9CK7isq2oxo0/sb7sDLZQdYfqGwZhKxiMku69gkfTib0Y5sI MKIQmaX8RheeNvfDycfQoXZWJj7EP4QJEk4VD0jbVISKSSgtU7rGXW9J2T8jITNgwH0l7litFq5 SmNUAUJWeJR7Yi6K8W47N5Vy0hc87HRoz9ojZLg6/CpXmdqwQFwJqexBOhVabU3OEiu2HaOq596 FhW0iG3oNVWwVtaoKoXqjnC0nKjuYG6NJp3x+ACzn0FaYWEQpGajUiGmpxUJIq2yT3NmI1YUuTF PPIhyoDaupXdOVe9J/w== 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-26_05,2026-08-26_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 phishscore=0 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608260168 Received-SPF: pass client-ip=148.163.158.5; envelope-from=farman@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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 8/11/26 10:46 AM, jrossi@linux.ibm.com wrote: > 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(-) I thought for sure I reviewed this in v1, and indeed I did. But you abstracted it further and left my tag off (thanks!), and this is even better. Reviewed-by: Eric Farman > > 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); > } > > -int virtio_ccw_run(VDev *vdev, int vqid, VirtioCmd *cmd) > -{ > - VRing *vr = &vdev->vrings[vqid]; > - int i = 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) > > 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 = &vdev->vrings[vqid]; > + int i = 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; > } > > void vring_init(VRing *vr, VqInfo *info)