From nobody Tue Sep 9 23:52:12 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 1748241487062133.95996180884356; Sun, 25 May 2025 23:38:07 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 31BAA15F9; Mon, 26 May 2025 02:38:06 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B1E141723; Mon, 26 May 2025 02:37:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2404D1627; Thu, 22 May 2025 15:56:16 -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 A732E162C for ; Thu, 22 May 2025 15:56:15 -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 54MIsjtN014400 for ; Thu, 22 May 2025 19:56:15 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 46t9m7r8my-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 19:56:15 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 54MHt8Ws020685 for ; Thu, 22 May 2025 19:56:14 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 46rwkq31yj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 22 May 2025 19:56:14 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 54MJuDoe25625180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 May 2025 19:56:13 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3F4E65803F; Thu, 22 May 2025 19:56:13 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D69AE58054; Thu, 22 May 2025 19:56:12 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.18.59]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 22 May 2025 19:56:12 +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=8iGsmLrL6qs5fe8Jg OQWH6Zf67pr7fY/frU6UuvCkaM=; b=tKGTF4QK5BT1gujOysF9bO3mS0TZ5axIt ikyinjRk/SON6pCRfcnTZg3dXxeZS/lmh0o1Cg5j5O2APpu1nGdzghvlUdk/HSbD RyBk/IE3Q/EQFF3pOC/XjVH8FPtwJ0O2Wm/l8fE8yDyoMav9hQn7JiWoEbqaXEww zMTcZQd0oFGrcWxjjBOM1XWzOrij4e6XOjc/sV+l21EAy5IT2+fx7FdOiQ0dFR+7 n/u7sS6ZXXsbNL02c3Pu/UM10OBVruOe2OsC0gIWHjQvQdCtq2LeKKgY+lDzHQQC wtr2Qw3HZNYcMyxW2WCpZVMpWoKQ9Q5sKg7nUCZ/ouOh2PSWZ/ZrQ== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [PATCH v3 2/2] Updates console port reservation comment and changes the allowZero variable to allowPortZero for clarity Date: Thu, 22 May 2025 15:56:11 -0400 Message-Id: <20250522195611.70685-3-aaronmbr@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250522195611.70685-1-aaronmbr@linux.ibm.com> References: <20250522195611.70685-1-aaronmbr@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=SMZCVPvH c=1 sm=1 tr=0 ts=682f815f cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=dt9VzEwgFbYA:10 a=VnNF1IyMAAAA:8 a=2QPpUPeIBFQSxtorMdQA:9 X-Proofpoint-GUID: czO7ciS-b_AghgzLEomweFXcI453lP1x X-Proofpoint-ORIG-GUID: czO7ciS-b_AghgzLEomweFXcI453lP1x X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5NyBTYWx0ZWRfXygxV+dpWtI8C U/wq2mcH/qXiAW0rmBXajaHFYfnzOSTbVBQHASEbyH43g9/qFbAwr4NtMK0dwtoeXfmDNN29zyD qkI/MSVA1IP9pH0+JFcv8PQQydh4dTZdM8UhVD7tkjh7Sl94VwZuz8Bl03q0TDh1SYWPJjp1eYr mH9aPWxBcH7l7vt/OPfgpA9+o3Sb7zGz0MKSX2sccPQ3q+H4hoAxKt90blBhWxTaJqjgtoAK3MG KExM/TiGSjpqmSkA0NKZieJxnJHkT0Yqnb/kA/CsIQ090sKH+idepW6LlWbrd5BgStA8Dx8YZoU LtOprgLNT8ThkeMBX5GnPSUpki5LkwfA1pQIzwf7o/hXCY/Kl9lwFLCz1kyCwXPxQOoGD0Ulcr0 +3uelG7bT0cUgkSsf4KugUpcENZ3xc7r+PY4eaMTL9tjt+HCikG8nRPFdVapxc6KOAU0zYkB 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-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=687 suspectscore=0 bulkscore=0 clxscore=1015 adultscore=0 phishscore=0 mlxscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220197 Content-Transfer-Encoding: quoted-printable X-MailFrom: aaronmbr@linux.ibm.com X-Mailman-Rule-Hits: nonmember-moderation 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 Message-ID-Hash: XZOYTQE4VVPISUDB32XPSQK4THR4F4KU X-Message-ID-Hash: XZOYTQE4VVPISUDB32XPSQK4THR4F4KU X-Mailman-Approved-At: Mon, 26 May 2025 06:37:07 -0400 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: 1748241487762116600 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 bc2b0f50e8..86f5cfc337 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 @@ -1745,7 +1745,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, =20 } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, - allowZero) < 0) + allowPortZero) < 0) return -1; } =20 @@ -1764,20 +1764,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; @@ -1785,7 +1785,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)