{"id":2222252,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2222252/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260411022618.2136588-16-kshk@linux.ibm.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260411022618.2136588-16-kshk@linux.ibm.com>","list_archive_url":null,"date":"2026-04-11T02:26:18","name":"[v2,15/15] s390x/pci: Create function to contain fmb_timer start","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c38c8cccb3c06ee54bc313621b42330cc201ff53","submitter":{"id":90249,"url":"http://patchwork.ozlabs.org/api/1.2/people/90249/?format=json","name":"Konstantin Shkolnyy","email":"kshk@linux.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260411022618.2136588-16-kshk@linux.ibm.com/mbox/","series":[{"id":499525,"url":"http://patchwork.ozlabs.org/api/1.2/series/499525/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499525","date":"2026-04-11T02:26:13","name":"s390x/pci: Implement migration for emulated devices","version":2,"mbox":"http://patchwork.ozlabs.org/series/499525/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222252/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222252/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256\n header.s=pp1 header.b=VIKbglzy;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fsyJQ1frwz1yCv\n\tfor ; Sat, 11 Apr 2026 12:28:06 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBO3y-0002AB-CO; Fri, 10 Apr 2026 22:27:10 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBO3w-00028Y-LP; Fri, 10 Apr 2026 22:27:08 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wBO3v-0000Ot-1y; Fri, 10 Apr 2026 22:27:08 -0400","from pps.filterd (m0356516.ppops.net [127.0.0.1])\n by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63B0O61x2272281; Sat, 11 Apr 2026 02:27:04 GMT","from ppma12.dal12v.mail.ibm.com\n (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220])\n by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dfbqk87ff-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Sat, 11 Apr 2026 02:27:03 +0000 (GMT)","from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1])\n by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id\n 63B18fQP026665;\n Sat, 11 Apr 2026 02:27:03 GMT","from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69])\n by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dcmg8ayy6-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);\n Sat, 11 Apr 2026 02:27:02 +0000","from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com\n [10.39.53.230])\n by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id\n 63B2R1DA21955174\n (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sat, 11 Apr 2026 02:27:01 GMT","from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id 5A2AE5805C;\n Sat, 11 Apr 2026 02:27:01 +0000 (GMT)","from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1])\n by IMSVA (Postfix) with ESMTP id C235258054;\n Sat, 11 Apr 2026 02:27:00 +0000 (GMT)","from WIN-DU0DFC9G5VV.ibm.com (unknown [9.61.252.248])\n by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP;\n Sat, 11 Apr 2026 02:27:00 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc\n :content-transfer-encoding:date:from:in-reply-to:message-id\n :mime-version:references:subject:to; s=pp1; bh=0b8DPYzewcBYS3p/y\n /Dw29FnQYtDItGrryLGjXtxKiI=; b=VIKbglzygcKCPgmRRkIHg7UMCX/+SrCrp\n Upq8SwOLLWeNOO4FGKMKpnAHXNza0og6yh98jT8bDcdhhzFvU1WBCA1XBHnypTvo\n g7rNXAdnT9tIw+AvUPniVDtu9ySbZHod5eROVi33OmhKPzGZD/4/JihIjgpvyp5Y\n 8cdmo0Xmh4XUkYwUeULUC7kSGk3+D36+j1IuyNkA1xJ1EXwgau6yL1hpacyx4q8m\n PpZLb7Uj8qloY/M/SNt9cPG+Ej5u2qXzDOVZbMmJits/5td6KiS8GoOyxnVRnxZz\n vZXJlNf86Scc7q3mKlkbknqLFaJEUF0zT+8QqpBjGcRFhr+N/B5+A==","From":"Konstantin Shkolnyy ","To":"mjrosato@linux.ibm.com","Cc":"alifm@linux.ibm.com, richard.henderson@linaro.org, iii@linux.ibm.com,\n david@kernel.org, cohuck@redhat.com, pasic@linux.ibm.com,\n borntraeger@linux.ibm.com, qemu-s390x@nongnu.org,\n qemu-devel@nongnu.org, Konstantin Shkolnyy ","Subject":"[PATCH v2 15/15] s390x/pci: Create function to contain fmb_timer\n start","Date":"Fri, 10 Apr 2026 21:26:18 -0500","Message-Id":"<20260411022618.2136588-16-kshk@linux.ibm.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260411022618.2136588-1-kshk@linux.ibm.com>","References":"<20260411022618.2136588-1-kshk@linux.ibm.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-TM-AS-GCONF":"00","X-Authority-Analysis":"v=2.4 cv=I+9Vgtgg c=1 sm=1 tr=0 ts=69d9b177 cx=c_pps\n a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17\n a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22\n a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=sKQJ3MkoBbxYwW_cRDQA:9","X-Proofpoint-GUID":"MtN3--agzVVZZKYXDcwxw-RvDoeMukaq","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDExMDAxNiBTYWx0ZWRfX/Q/QSqnj50T3\n BXjTRXtkdOqf+aOUrXiJ3dDBu2QLWsRNSm+fCZaFa2O8EqUhw3zSdbQTf3+3Vv6R32kxXOObJ3x\n isp5f9LybjDg72HGj6FtUiEjuZ2/iOTTuPdwlXnS/pq7CKM1ZPwUhUAwL/2oYHl7NhpiS2kb0RX\n otdrsQSaWrDttpRUSZHDFJM0z4DoqOBzoXo3v1YsOSeQblnYR7YBceBL7ViKu4emB+Lsk/QekH3\n RBL4bnqeOg9J8JgBEbXfiXsPgpbHqyECf/mNbNBJ+aj6tUK0HEajYf0D1fNfDOMVM5dpxRU8ymW\n ZBP+k8xjORNCRetJmst17euo6lrGpY/i1r9BHHIGllqKG/Nafuy+jSrT64sVD6yzyc2wA+pmGmr\n 3A/HNvpxtiIe0pPYqaXsisl+Av2NqH+hWVnM/aw22dXmnrmxgOzKeUBwmQ3Cw45tbLd8pvOAX/y\n TUo2yZkBB8MMVQa/EVg==","X-Proofpoint-ORIG-GUID":"MtN3--agzVVZZKYXDcwxw-RvDoeMukaq","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-10_07,2026-04-09_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n priorityscore=1501 impostorscore=0 bulkscore=0 suspectscore=0 adultscore=0\n lowpriorityscore=0 spamscore=0 malwarescore=0 clxscore=1015 phishscore=0\n classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0\n reason=mlx scancount=1 engine=8.22.0-2604010000 definitions=main-2604110016","Received-SPF":"pass client-ip=148.163.158.5; envelope-from=kshk@linux.ibm.com;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7,\n RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"fmb_timer is now started in 3 different places. The new function will encapsulate\nthat to make sure mui is added in all cases.\n\nSigned-off-by: Konstantin Shkolnyy \n---\n hw/s390x/s390-pci-bus.c | 5 ++---\n hw/s390x/s390-pci-inst.c | 14 ++++++++++----\n include/hw/s390x/s390-pci-bus.h | 1 +\n 3 files changed, 13 insertions(+), 7 deletions(-)","diff":"diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c\nindex ab9339bdc7..235c47875e 100644\n--- a/hw/s390x/s390-pci-bus.c\n+++ b/hw/s390x/s390-pci-bus.c\n@@ -1685,9 +1685,8 @@ static int s390_pci_device_post_load(void *opaque, int version_id)\n assert(pbdev->pci_group);\n pbdev->fmb_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL,\n fmb_update, pbdev);\n- timer_mod(pbdev->fmb_timer,\n- qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +\n- pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev,\n+ qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL));\n }\n return 0;\n }\ndiff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c\nindex a9c0a4effb..62ecd50dcb 100644\n--- a/hw/s390x/s390-pci-inst.c\n+++ b/hw/s390x/s390-pci-inst.c\n@@ -1094,9 +1094,16 @@ static int fmb_do_update(S390PCIBusDevice *pbdev, int offset, uint64_t val,\n return ret;\n }\n \n+void s390_pci_schedule_fmb_timer(S390PCIBusDevice *pbdev, uint64_t start)\n+{\n+ timer_mod(pbdev->fmb_timer, start + pbdev->pci_group->zpci_group.mui);\n+}\n+\n void fmb_update(void *opaque)\n {\n S390PCIBusDevice *pbdev = opaque;\n+\n+ /* Must be read before updating U bit */\n int64_t t = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL);\n int i;\n \n@@ -1133,7 +1140,7 @@ void fmb_update(void *opaque)\n sizeof(pbdev->fmb.last_update))) {\n return;\n }\n- timer_mod(pbdev->fmb_timer, t + pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev, t);\n }\n \n static int mpcifc_reg_int_interp(S390PCIBusDevice *pbdev, ZpciFib *fib)\n@@ -1326,9 +1333,8 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,\n timer_del(pbdev->fmb_timer);\n }\n pbdev->fmb_addr = fmb_addr;\n- timer_mod(pbdev->fmb_timer,\n- qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) +\n- pbdev->pci_group->zpci_group.mui);\n+ s390_pci_schedule_fmb_timer(pbdev,\n+ qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL));\n break;\n }\n default:\ndiff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h\nindex 15cf004c31..75376779e7 100644\n--- a/include/hw/s390x/s390-pci-bus.h\n+++ b/include/hw/s390x/s390-pci-bus.h\n@@ -419,5 +419,6 @@ S390PCIBusDevice *s390_pci_find_next_avail_dev(S390pciState *s,\n S390PCIBusDevice *pbdev);\n void s390_pci_ism_reset(void);\n void fmb_update(void *opaque);\n+void s390_pci_schedule_fmb_timer(S390PCIBusDevice *pbdev, uint64_t start);\n \n #endif\n","prefixes":["v2","15/15"]}