From nobody Tue Sep 9 23:37:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=reject dis=none) header.from=linux.ibm.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1747963723035295.6315511448315; Thu, 22 May 2025 18:28:43 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 141A2161E; Thu, 22 May 2025 21:28:42 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9720318A2; Thu, 22 May 2025 21:27:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 83CAC15ED; Thu, 22 May 2025 21:27:44 -0400 (EDT) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 15EBB15ED for ; Thu, 22 May 2025 21:27:41 -0400 (EDT) Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MNW5un025473 for ; Fri, 23 May 2025 01:27:40 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 46t9j91g6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 May 2025 01:27:40 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54N0wZQT032056 for ; Fri, 23 May 2025 01:27:38 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 46rwmqca7d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 May 2025 01:27:38 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54N1Rbs915336058 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 23 May 2025 01:27:37 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8B7C458060; Fri, 23 May 2025 01:27:37 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C62D5804E; Fri, 23 May 2025 01:27:37 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.146.155]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 23 May 2025 01:27:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 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=0LuqgKOzkwSF6v8jg pueDTPrTKXQaf34Xor0EQQ8ZOg=; b=VyJ4aFpEn4saEnlWrpIIVVI8EGUmChT+x sqCaRcX0OTm13sfCIYTmpar2oz4mUU6sQJKdz9VK+N9GubGdr4HSfakpnDUknPXO 0sADc4O44P0zjaMv1R9oLF5XjqBxqLNcsMRo45kXf7vWX6zLfBNQKjv9pcp4HPLe ++8hTDj3aQTPWL88TfTaGg/B75djutq2FIE7HE/o78/JyclCJ7tiWp3nvtI6cNFH +CeueLLx21GJs8inxpNzwLmWBUiUOiXuZbNPGQRFAUnlgnEvIkIf/QOaHx61AqKV 2/KpvaL/qRh1q8WRsVE6T9Sm2cOCfVe0DBbgNcOpmUJ5AKrjdJWmQ== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [PATCH v4 1/2] virDomainVirtioSerialAddrAssign: Fix virtio console port assignment on vioserial bus Date: Thu, 22 May 2025 21:27:34 -0400 Message-Id: <20250523012735.89278-2-aaronmbr@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250523012735.89278-1-aaronmbr@linux.ibm.com> References: <20250523012735.89278-1-aaronmbr@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: latXVfx7Pt8TbWl-hobCao54oBAeaM84 X-Authority-Analysis: v=2.4 cv=O6Y5vA9W c=1 sm=1 tr=0 ts=682fcf0c cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=JgoHgMeF0ak0GS4v3pYA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIzMDAwNyBTYWx0ZWRfXz+0Gs4o4BXNH QnLXK6YVGKvSLwib810omGLqlm/o3GCtRri+3oWCa3Y5RKGVoOC5JcC2ly0m9ncEFXIhhQvxipg y1QSxxr453NOS36u6NMDHeV76JxXB/6hkooAZMiXvDcIjYjgMyTu/pK7PbKp703B2p34pnOf8Xp AUGX1tJlvWYohZSV2TTdq+Cxz06+qkQOXnweWsiZHsW4hSXSdezvQpz2ynmGfXdVzc+Wz/AtUqO cXSUxdChQxnltdjz37qrx4dzb48RgNjh2E58gKlewCaOcUtRYZ1BsMqj79CfWbYoRTRW4vtffMc M6DP7LxK2V+2xjTQcPVB4AQvky3RW/O+bVHpsE0nX7ySSDp4oQFzwb+DfBWpCE6NpXam0feKdgt sMhRfjeLWdn//SC+KfCS1n/8ylKszJDTr+8bSjsxrXVGkgok7mfVkriu6y8kxViibTrNT9BR X-Proofpoint-ORIG-GUID: latXVfx7Pt8TbWl-hobCao54oBAeaM84 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-23_01,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 suspectscore=0 adultscore=0 spamscore=0 mlxlogscore=849 phishscore=0 malwarescore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505230007 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3ZSB4RDP2ODM6XS7J6EILCBLLN36IMHF X-Message-ID-Hash: 3ZSB4RDP2ODM6XS7J6EILCBLLN36IMHF X-MailFrom: aaronmbr@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Boris Fiuczynski X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747963723614116600 Content-Type: text/plain; charset="utf-8" This change fixes an issue with virito console port assignment on vioserial= buses. Currently, a virtio console device cannot be assigned to a port greater tha= n 0 on vioserial buses. When trying to add more than one virtio console device on = a single vioserial bus, you will get a port already exists with id 0 error. Therefore, the data needs to be passed back into info when allowZero is true Fixes: 16db8d2ec540 ("Add functions to track virtio-serial addresses") Reviewed-by: Boris Fiuczynski Signed-off-by: Aaron M. Brown --- src/conf/domain_addr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8dfa8feca0..bc2b0f50e8 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1737,6 +1737,12 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, if (virDomainVirtioSerialAddrNextFromController(addrs, &ptr->addr.vioseri= al) < 0) return -1; + + if (ptr =3D=3D &nfo) { + /* pass the vioserial data back into info */ + info->addr.vioserial =3D ptr->addr.vioserial; + } + } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, allowZero) < 0) --=20 2.39.5 (Apple Git-154)