From nobody Tue Sep 9 02:49:11 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 1749168615827518.0455012187642; Thu, 5 Jun 2025 17:10:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C3EDB1378; Thu, 5 Jun 2025 20:10:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4BE811477; Thu, 5 Jun 2025 20:09:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BD74DCA1; Thu, 5 Jun 2025 20:09:29 -0400 (EDT) Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 434DFB8F for ; Thu, 5 Jun 2025 20:09:29 -0400 (EDT) Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 555Jf2pF017073 for ; Fri, 6 Jun 2025 00:09:28 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 472fwuu1h6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 06 Jun 2025 00:09:28 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 555Ld5bb012549 for ; Fri, 6 Jun 2025 00:09:28 GMT Received: from smtprelay04.dal12v.mail.ibm.com ([172.16.1.6]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 470et2prw7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 06 Jun 2025 00:09:28 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay04.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55609QZi24904328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 6 Jun 2025 00:09:27 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9DD6058054; Fri, 6 Jun 2025 00:09:26 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4205B5803F; Fri, 6 Jun 2025 00:09:26 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.15.163]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 6 Jun 2025 00:09:26 +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=gxkiYlZCuILAP6IWu obMXZQcW4MhZ8TeTKavw74kTbI=; b=phr7ZaLs3SulHTsRCD/iU7VbOuwNwBVzj /XJB5KxcI2aQfQWL2BkbLttMLx0Zokh8mUXMW9NyVKnNLrIPo1aLJSaLMCi3dbMm t7o85UstirKQLC2msIeHbIabkuX47k0pYdAQuYqv2FkP5p39p0X+g1D7eFHiPCbK AKLvJFpxX+PrKpc6g2mBTUarH6yeP/TD1ozhut7t8WemiRhneYSQ8RDVLqzuzxea P+UFBrNm8BWUmtTudzuXlXqQ6nFgPvBDfi1oXA3rSJUQL6pmIxgF+aGFNabl13Qx +EUwVcuO3Jra2sM4bLyHQEOyScNghMWwOZix2PNztKbx5nbHQw3kg== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [PATCH v5 2/3] virDomainVirtioSerialAddrAssign: Fix virtio console port auto assignment on vioserial bus Date: Thu, 5 Jun 2025 20:09:23 -0400 Message-Id: <20250606000924.75241-3-aaronmbr@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250606000924.75241-1-aaronmbr@linux.ibm.com> References: <20250606000924.75241-1-aaronmbr@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjA1MDIxOSBTYWx0ZWRfX0/bw0lBupLGN zcMMv5SRFpqYBzksoYGP5c+f4PkDuvp98hVdsbCXWaGwKh6K23absbrPbUHH66Pqlb7jiRMJ5Qy /cmOHEsQWTEjN/YU4lqWYwlp34hhuNxQZ/0f16PwB7HXNqA5vK7TprSyaOd2aGsSps1xwKehwVR ECdoje9UxusjOwnPtfLAx1yDqbgeLIMWUo5eZa9hwLVPg188tTxRN7Bf3MQyNuBZ8sy9Ak9w3J3 HguKtm/C+5xi4vs31r4roDND4NyXKIMwKUwmHwgRkUEMAh20t/KUpEDyzFtaw04wAZYYtk6hQqR LvhxZG4KI1VWEuPCowqDCcP4M5YxLr42P4B8+jHc9s2JMliWb3kse0OURhbD8oTY17B9Ix6N6HM 5q85U7b2D/egXbITvJJqjJjRe82sYBuUbDlsIYuR0CEBKuaDm99gA1O31H0hfBmv4YxnaRnB X-Proofpoint-GUID: 3hQNakzfUMg8ak8eHzAfntkwvaRt2494 X-Proofpoint-ORIG-GUID: 3hQNakzfUMg8ak8eHzAfntkwvaRt2494 X-Authority-Analysis: v=2.4 cv=QtVe3Uyd c=1 sm=1 tr=0 ts=684231b8 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=2qk7KiHGgdWAejVCu6YA:9 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-06-05_08,2025-06-05_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 suspectscore=0 bulkscore=0 adultscore=0 phishscore=0 impostorscore=0 malwarescore=0 priorityscore=1501 mlxlogscore=879 lowpriorityscore=0 spamscore=0 clxscore=1015 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506050219 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 67UBPOQS7X4YO46DHTMSRCOU33NICM74 X-Message-ID-Hash: 67UBPOQS7X4YO46DHTMSRCOU33NICM74 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: 1749168616993116600 Content-Type: text/plain; charset="utf-8" This change fixes an issue with virtio console port assignment on vioserial= buses. Currently, when trying to autoassign a virtio console device, the device ca= nnot be assigned to a port greater than 0 on vioserial buses. You will receive the following error: `virtio-serial-bus: A port already exists at id 0` 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 8dfa8feca0..76e11c0dde 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1737,6 +1737,13 @@ 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 as info is used + * later for port assignment */ + info->addr.vioserial =3D ptr->addr.vioserial; + } + } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, allowZero) < 0) --=20 2.39.5 (Apple Git-154)