From nobody Sun Oct 5 01:46:18 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=pass; 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=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1758310197; cv=none; d=zohomail.com; s=zohoarc; b=SqehdjIliVGEb/+eNDuxYGXoy4FO1xJl8yZLZ70yiciepswwXKJ1GYn40D4oesh3DVBoPmKlc5o8faUR+h4YFq/hZpmFEEv1Q71vkiNyuuj/CW1DuPy2Trf82aA+Pr4nQjgLwvG4dZZtfoIua+8CqVm854e2X6jLHLRaTf1oT4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758310197; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xTkE5CTeKtctSkFBmsL695aGL8dEzs48/Nm3TPXyw0M=; b=low5hT7jz2StfeM56WexE6/YZziiwnN0/PkWMRhMwp3vMMqhS52F9lx0y/dIh2thdjiOVwIS/rmkYPyTrH8lzYEfhb2+dHgxsTFAlo0WUSB3q11p3Hp8r8r+9xBuXIfqQur+j8Bz7PsDyOjvEgNWaeVLBCdtzZflVp0sarmiqxs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1758310197028429.42673391814844; Fri, 19 Sep 2025 12:29:57 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1F01C41C49; Fri, 19 Sep 2025 15:29:56 -0400 (EDT) Received: from [172.19.199.10] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5076243EBC; Fri, 19 Sep 2025 15:26:52 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8E3B141C0F; Fri, 19 Sep 2025 15:26:25 -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 C503641C15 for ; Fri, 19 Sep 2025 15:26: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 58JEjhZ5000601 for ; Fri, 19 Sep 2025 19:26:24 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 498dtwsq9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Sep 2025 19:26:24 +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 58JIDPRQ027341 for ; Fri, 19 Sep 2025 19:26:23 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 495menncb5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Sep 2025 19:26:23 +0000 Received: from smtpav06.wdc07v.mail.ibm.com (smtpav06.wdc07v.mail.ibm.com [10.39.53.233]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 58JJQMRP59441580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 19 Sep 2025 19:26:23 GMT Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9607658055 for ; Fri, 19 Sep 2025 19:26:22 +0000 (GMT) Received: from smtpav06.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 45F0658060 for ; Fri, 19 Sep 2025 19:26:22 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.247.98]) by smtpav06.wdc07v.mail.ibm.com (Postfix) with ESMTP for ; Fri, 19 Sep 2025 19:26:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 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=xTkE5CTeKtctSkFBm sL695aGL8dEzs48/Nm3TPXyw0M=; b=kbJvQ9+f3yuWGpsmJXnFMj64rW5SWxCIZ U4nOwX//XyM3WbVaNaZTT+zZkXN7KGNBxRAa+VBAWD07tRDuw2c4e0quGVD6s60k K8wm1t1g0Y8h52qCsgZeGUlQu8Ui/+u59+H0hDU31b84QokP1abv081/Kv0UaxbT 8OnZK44jUfvJDtRFdTNQQYwEbbE09JQ1oqaTfIaW9c9XG8CVO933yXZaKLRhzHdU z15wOzz+tUMWOrK87i+zd16h8tmUgtdQAjW2KvCIC62oJEVxpY6A+ZXgT+Hrotc2 oRg7Un9EGgQ0luICbP09/5bXoJSUkXd60j7GSBflPZjz6oyh+BA+g== From: "Aaron M. Brown" To: devel@lists.libvirt.org Subject: [RFC PATCH v7 3/3] domain_addr.c: update virtconsole port reservation comment and allowZero var Date: Fri, 19 Sep 2025 15:26:20 -0400 Message-Id: <20250919192620.4852-4-aaronmbr@linux.ibm.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250919192620.4852-1-aaronmbr@linux.ibm.com> References: <20250919192620.4852-1-aaronmbr@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=EYvIQOmC c=1 sm=1 tr=0 ts=68cdae60 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=yJojWOMRYYMA:10 a=VnNF1IyMAAAA:8 a=2h4MXXhTqgOg8KCfHnsA:9 X-Proofpoint-ORIG-GUID: 6iai_-BeqiBkLKcKSi4nRByJS0weezGJ X-Proofpoint-GUID: 6iai_-BeqiBkLKcKSi4nRByJS0weezGJ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTE4MDA2NSBTYWx0ZWRfXxTa2v7EMYizd 9VNZBrKD/+EjDCcftljoS9epRFgYma/AzCVuuO/nMlgP5kYj5Bz8Jmq3htbqNbmKVCKHpn/hCa3 qqHbxblaZbGJaqtIzRUTsPtjOdwuaaR185ZQDK5EXZTVOQLxTakzjMZDTPD/4luTD++3jqZmjCy ay0gqG5jBPS5owKE/pROBYZphMtqZNqfYpD206u6ydzEw3ElXhVAgRHOqvsF4osKEtmNZNY7vDE XdRnp1FbcvwNfUVTR5gSfOIB+NJKK++izkPSgsOnO+4+CptOTnCmQTJKAqM21TZCbaA972SudHM hvdqQ//5+xK34ba78pAYUSNJVomTFw6Le697D7tINgjbnnOSRZbapeRkm+CHqKYm17Ua9Qp2r23 7RfGGBWr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-19_02,2025-09-19_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1015 suspectscore=0 malwarescore=0 spamscore=0 priorityscore=1501 impostorscore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509180065 Message-ID-Hash: QHW762OV5TI3IOERHB7KAPMWGFGQAUFP X-Message-ID-Hash: QHW762OV5TI3IOERHB7KAPMWGFGQAUFP X-MailFrom: aaronmbr@linux.ibm.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1758310198850116600 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 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 87c5973fab..d8d482958f 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1663,14 +1663,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) { @@ -1718,14 +1718,14 @@ virDomainVirtioSerialAddrNext(virDomainDef *def, static int virDomainVirtioSerialAddrNextFromController(virDomainVirtioSerialAddrSet *= addrs, virDomainDeviceVirtioSerialAdd= ress *addr, - bool allowZero) + bool allowPortZero) { ssize_t startPort =3D 0; ssize_t port; ssize_t i; virBitmap *map; =20 - if (allowZero) + if (allowPortZero) startPort =3D -1; =20 i =3D virDomainVirtioSerialAddrFindController(addrs, addr->controller); @@ -1755,11 +1755,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; virBitmap *map; ssize_t i; =20 @@ -1769,7 +1769,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) { @@ -1789,7 +1789,7 @@ virDomainVirtioSerialAddrAssign(virDomainDef *def, =20 } else { if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, - allowZero) < 0) + allowPortZero) < 0) return -1; } =20 @@ -1808,20 +1808,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; @@ -1829,7 +1829,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)