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 1749168669200525.7786085638619; Thu, 5 Jun 2025 17:11:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4506DBDC; Thu, 5 Jun 2025 20:11:08 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 51E6E1499; Thu, 5 Jun 2025 20:09:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8AAEDC84; Thu, 5 Jun 2025 20:09:30 -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 1251DCA1 for ; Thu, 5 Jun 2025 20:09:30 -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 555KRFb4019794 for ; Fri, 6 Jun 2025 00:09:29 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 472fwuu1h7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 06 Jun 2025 00:09:29 +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 555LFDj2019937 for ; Fri, 6 Jun 2025 00:09:28 GMT Received: from smtprelay05.dal12v.mail.ibm.com ([172.16.1.7]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 470d3p73nt-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 smtprelay05.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55609Rxr20972070 (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 273765804E; Fri, 6 Jun 2025 00:09:27 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C4A7B5803F; 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=kQzHZ9vFH1YFy+nFn ZBkplaPpZ9iLWbOUEIJTk/sNEY=; b=HrB8hky0wM091pAUoSl7wRtsUMs3f/IYM u1aIEv4XOsULlZXy54CqlUGApYm44qYpwA+O9ItFdN1a/BjyiH3fE0ho9UDH5ekV pVn2/ByxK1nqMd/WZlTOSKwzSzk75IR2bTP+lxSqelnFVK91VTNeyLmk+SleXdJ6 JUSBAaQXygILqjv1MK6uBbhUosG00YTUAR3Pqf4QEV5oNZy9biKr4I9+2l/NXHj5 G3WHQv5kp84sVLFO9PGAy8h4VuM410BSQqfeBrE7GfaYn/hVpTtC/K8OjSAUaJSO WXxy0jYjYNR7hdwSR0RE9oZKgpUV/jsyoHwtEmDxj8QtZFmddUy+w== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [PATCH v5 3/3] domain_addr.c: update console port reservation comment and allowZero var to allowPortZero for clarity Date: Thu, 5 Jun 2025 20:09:24 -0400 Message-Id: <20250606000924.75241-4-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: AW1haW4tMjUwNjA1MDIxOSBTYWx0ZWRfXxK9gUZ7Zvc/d QpvOHtV6qvGGr+Rmj/emNXH+DB3rLznsXfmMBEVc5UzaKMjuGSIzpeUp9v8JWkS6LEvAHeIjpDn yzO2/cW6pZaH/pS1S6jhqRKbf4bxXhuUtXxuYyU2/wcRFDu9F/HWFUunh6EsGL/U85ao99RBp/b T7OsB7lU24UN4h7ikrECg5CTVFmC3qhKdKbunSwTMn1KPTNarWMOX9wHKZSJWpjOrSG6fYxDtr8 yfgiXNzLDPF0KZHpAXixhJw2DcZkrV0VQEQG1sVsh5gscEYKrnoKLS6KWWffCeaesvKqvk/tt6O 70pqVOQW+nrewCt8l7NuCGOwwKovE5ZPFkhiZ+j4ai9dHNmmpqfu602QBpnvtLleciVT3DmbyqP BmRTyyKgGkJ0HHw4fqT3IeteKpHpcw3AgNOMS7yQqpgxZvDB4iVBZKAlFnvs5fTbZmVcxjV3 X-Proofpoint-GUID: MMUXbALg8Yh-RpKc5M0ThUCQfflcI0yU X-Proofpoint-ORIG-GUID: MMUXbALg8Yh-RpKc5M0ThUCQfflcI0yU X-Authority-Analysis: v=2.4 cv=QtVe3Uyd c=1 sm=1 tr=0 ts=684231b9 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=2QPpUPeIBFQSxtorMdQA: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=807 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: ALXPQOS5OGFT2FONYA6FRH27F5YSD6AR X-Message-ID-Hash: ALXPQOS5OGFT2FONYA6FRH27F5YSD6AR 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: 1749168671483116600 Content-Type: text/plain; charset="utf-8" Reviewed-by: Boris Fiuczynski Signed-off-by: Aaron M. Brown --- src/conf/domain_addr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 76e11c0dde..1d417ac36d 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) { @@ -1725,11 +1725,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; =20 @@ -1746,7 +1746,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, =20 } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, - allowZero) < 0) + allowPortZero) < 0) return -1; } =20 @@ -1765,20 +1765,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; @@ -1786,7 +1786,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)