From nobody Tue Sep 9 19:08:47 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 1753206680933802.0969439343106; Tue, 22 Jul 2025 10:51:20 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E2212121C; Tue, 22 Jul 2025 13:51:19 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id DD8A512FF; Tue, 22 Jul 2025 13:50:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E5ABD9F5; Tue, 22 Jul 2025 13:50:24 -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 680F29F5 for ; Tue, 22 Jul 2025 13:50:24 -0400 (EDT) Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 56MH9Ixp024603 for ; Tue, 22 Jul 2025 17:50:24 GMT Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 482esy0a07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Jul 2025 17:50:23 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 56MFGUQY014391 for ; Tue, 22 Jul 2025 17:50:23 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 480ppp40u4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 22 Jul 2025 17:50:23 +0000 Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 56MHoMc427591244 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 22 Jul 2025 17:50:23 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DBDC85805A for ; Tue, 22 Jul 2025 17:50:22 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A44E58054 for ; Tue, 22 Jul 2025 17:50:22 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.246.227]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP for ; Tue, 22 Jul 2025 17:50:22 +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.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4,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= content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=qAwicnUFrovIlZD8n J9V++Ygb3/oHjpPq90TVzsoCgM=; b=qdSkUnB0ZQjskgr3nmV3zVWJFGgnS1lcq MoAzgDzMJRB3WtT/BoqFUf8y8Rvd11aPLUYmz3nrG6jh8+cT5y+LIPE7VZBp9dFR pGurI/e5NUn9Y/yN3/vcnKoDcII8JSKX0uO5XsErJWuXK6iTm/lZ/6HEUxPMKl/K Qo5fo8gQKW5+rcq7m5+50mNjsKtPF/0c548Hr7kGaZfpWv3Kfy8zRGUl6qcgTHj6 MgTewcAxWH8qMBdQMdm9HzCqnNUJj8HDgm6YvXbyIIQnfi8AM/f236wAAfKHcq+L zQvURzZZZwDLbT1ocvS1wsXjYn+6XSJ0GKLEht6lFaGwvNkSMx3Yg== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [PATCH v6 3/3] domain_addr: update virtconsole port reservation comment and allowZero var Date: Tue, 22 Jul 2025 13:50:20 -0400 Message-Id: <20250722175020.88279-4-aaronmbr@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250722175020.88279-1-aaronmbr@linux.ibm.com> References: <20250722175020.88279-1-aaronmbr@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2swhUkpBiHlul6iU2mgR3OExoxaZT5fW X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIyMDE0OSBTYWx0ZWRfX2s73iNzh0c/s SQllcjt17rLgPkmjg4MVALltExnEufTD7EeK39dvy5CJ6+r8T6yVymRCVT7etzqrDgRsWnKHY/+ IrcJp81t3azRVoPGuPOIoYSEr8tFg4P7AamR3Tx3hXZgLuW0iU1l35tru/RjY+cSi6ttqkYUass bZfPA5VYB59F/VRjsdpjCYjN/PUzo0seJomCy9zQ/S8nXOcCxqrwg/LfEMmLQ76hHWS+QIhU8V5 fYk+CACEBNzKiTYB3XNbhYZJ5cmgzXhsl8d174Otz8Xt9/It1+Y9HDilb220IIYkoMjCx3hmcjR YAvp2lJMPVFxGg9TqlknOZHCCNT6JcC2p4mfn2qFlns6U+ffhumSj51U6idqXwiy7S8/TmzR/cM Hpyi3QH6fukLYIa8AwAbDrvj7DgWaFMCjUMgHxHQKEpzcpK7/4wfwWTykup1aDuAwtbuS89H X-Authority-Analysis: v=2.4 cv=SrWQ6OO0 c=1 sm=1 tr=0 ts=687fcf5f cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Wb1JkmetP80A:10 a=VnNF1IyMAAAA:8 a=tQvrLDuPLxqepPh4yN4A:9 X-Proofpoint-GUID: 2swhUkpBiHlul6iU2mgR3OExoxaZT5fW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-22_02,2025-07-21_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 adultscore=0 mlxscore=0 suspectscore=0 malwarescore=0 priorityscore=1501 phishscore=0 clxscore=1015 impostorscore=0 lowpriorityscore=0 mlxlogscore=952 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507220149 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CYLUMCAY4J6OGOKXPYULH6GT4NWPDDRJ X-Message-ID-Hash: CYLUMCAY4J6OGOKXPYULH6GT4NWPDDRJ 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 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: 1753206682352116600 Content-Type: text/plain; charset="utf-8" Rename variable "allowZero" to "allowPortZero" for clarity and update the v= irtconsole port reservation comment, as port 0 is reserved for the first virtconsole unless specified. Signed-off-by: Aaron M. Brown --- src/conf/domain_addr.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5448d3d078..1bf0530688 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1638,14 +1638,14 @@ static int virDomainVirtioSerialAddrNext(virDomainDef *def, virDomainVirtioSerialAddrSet *addrs, virDomainDeviceVirtioSerialAddress *addr, - bool allowZero) + bool allowPortZero) { ssize_t port, startPort =3D 0; ssize_t i; unsigned int controller; =20 - /* port number 0 is reserved for virtconsoles */ - if (allowZero) + /* port number 0 is reserved for the first virtconsole */ + if (allowPortZero) startPort =3D -1; =20 if (addrs->ncontrollers =3D=3D 0) { @@ -1693,13 +1693,13 @@ virDomainVirtioSerialAddrNext(virDomainDef *def, static int virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *= addrs, virDomainDeviceVirtioSerialAdd= ress *addr, - bool allowZero) + bool allowPortZero) { ssize_t port, startPort =3D 0; ssize_t i; virBitmap *map; =20 - if (allowZero) + if (allowPortZero) startPort =3D -1; =20 i =3D virDomainVirtioSerialAddrFindController(addrs, addr->controller); @@ -1724,7 +1724,7 @@ virDomainVirtioSerialAddrNextFromController(virDomain= VirtioSerialAddrSet *addrs, addr->port); =20 /* if this is the first virtconsole, reserve port 0 */ - if (allowZero && port =3D=3D 0) { + if (allowPortZero && port =3D=3D 0) { ignore_value(virBitmapSetBit(map, 0)); VIR_DEBUG( "Port 0 reserved for the first virtconsole on vioserial contro= ller %1$u", @@ -1738,11 +1738,11 @@ static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) virDomainVirtioSerialAddrAssign(virDomainDef *def, virDomainVirtioSerialAddrSet *addrs, virDomainDeviceInfo *info, - bool allowZero, + bool allowPortZero, bool portOnly) { virDomainDeviceInfo nfo =3D { 0 }; - virDomainDeviceInfo *ptr =3D allowZero ? &nfo : info; + virDomainDeviceInfo *ptr =3D allowPortZero ? &nfo : info; =20 ptr->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL; ptr->addr.vioserial.controller =3D info->addr.vioserial.controller; @@ -1750,7 +1750,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, if (portOnly) { if (virDomainVirtioSerialAddrNextFromController(addrs, &ptr->addr.vioseri= al, - allowZero) < 0) + allowPortZero) < 0) return -1; =20 if (ptr =3D=3D &nfo) { @@ -1761,7 +1761,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, =20 } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, - allowZero) < 0) + allowPortZero) < 0) return -1; } =20 @@ -1780,20 +1780,20 @@ int virDomainVirtioSerialAddrAutoAssignFromCache(virDomainDef *def, virDomainVirtioSerialAddrSet = *addrs, virDomainDeviceInfo *info, - bool allowZero) + bool allowPortZero) { bool portOnly =3D info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIR= TIO_SERIAL; if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL && info->addr.vioserial.port) return virDomainVirtioSerialAddrReserve(NULL, NULL, info, addrs); else - return virDomainVirtioSerialAddrAssign(def, addrs, info, allowZero= , portOnly); + return virDomainVirtioSerialAddrAssign(def, addrs, info, allowPort= Zero, portOnly); } =20 int virDomainVirtioSerialAddrAutoAssign(virDomainDef *def, virDomainDeviceInfo *info, - bool allowZero) + bool allowPortZero) { virDomainVirtioSerialAddrSet *addrs =3D NULL; int ret =3D -1; @@ -1801,7 +1801,7 @@ virDomainVirtioSerialAddrAutoAssign(virDomainDef *def, if (!(addrs =3D virDomainVirtioSerialAddrSetCreateFromDomain(def))) goto cleanup; =20 - if (virDomainVirtioSerialAddrAutoAssignFromCache(def, addrs, info, all= owZero) < 0) + if (virDomainVirtioSerialAddrAutoAssignFromCache(def, addrs, info, all= owPortZero) < 0) goto cleanup; =20 ret =3D 0; --=20 2.39.5 (Apple Git-154)