From nobody Mon Feb 2 09:26:04 2026 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; 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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1768289901; cv=none; d=zohomail.com; s=zohoarc; b=bSe6/RTOiZWpHFMKY2qZsfEjSusnkCFU89KY7lDyDCqiKY94woxxEnamlorMNxB5jLIgBE8JeGu5sM+LuMi7PCujn9j4nMGMOdSyopmKvHAAg69MD26Y9Eu/zC8DlbSKlnVkDDVSDSYsNM9JPqVIjkXGe8xWJHCfW3MqCgDj2Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768289901; h=Content-Type: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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=UBZE1gheJwcxxCvcKwFI/ax9oR7CMxZCIg6cMLqhXMA=; b=c7D/zvxJXF3jSQ3odw8Ftkv0Moa1fblJ61uMwV82/fuGPLWxKM/sQMcbMbLwCg56ZhED43asYhlQhodvcQSRM9dRATX5NspQ2o/dD77ZqraMepr7uROo9nDz16DWm95PaNXgYSIGdwxtPWzPQQ5HZsxzAsyHKynBSGHwiqt0jgU= ARC-Authentication-Results: i=1; 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=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 1768289901377245.49721492680385; Mon, 12 Jan 2026 23:38:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 477CA418B0; Tue, 13 Jan 2026 02:38:20 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0646D4189D; Tue, 13 Jan 2026 02:35:38 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6857D41895; Tue, 13 Jan 2026 02:35:19 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id AA7FC41866 for ; Tue, 13 Jan 2026 02:35:18 -0500 (EST) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-685-B3FjpJa4M3ScHKjI4i5K8Q-1; Tue, 13 Jan 2026 02:35:16 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CAA5A195423A for ; Tue, 13 Jan 2026 07:35:15 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.80.83]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 72DCA1800665 for ; Tue, 13 Jan 2026 07:35:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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=redhat.com; s=mimecast20190719; t=1768289718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UBZE1gheJwcxxCvcKwFI/ax9oR7CMxZCIg6cMLqhXMA=; b=DVvKl24/j1PHXhiULTxQdGaS3ORZf+GQMdJ1nXcR3ZrjJnDQy+IL4e9OnJVI/bWWiOUW7E /a5tPGGTQ86aR0C9SBXcnUU68MysN7WSSZwk037aiu1GGB8R5WigEEADzYYP2o72dIQjU2 d7oEW1mv9GxmrwaeuZvKWGBseDQI+CQ= X-MC-Unique: B3FjpJa4M3ScHKjI4i5K8Q-1 X-Mimecast-MFC-AGG-ID: B3FjpJa4M3ScHKjI4i5K8Q_1768289715 To: devel@lists.libvirt.org Subject: [PATCH 2/3] conf: new function virDomainNetPortForwardIsEqual() Date: Tue, 13 Jan 2026 02:35:12 -0500 Message-ID: <20260113073513.189733-3-laine@redhat.com> In-Reply-To: <20260113073513.189733-1-laine@redhat.com> References: <20260113073513.189733-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: dttbXjlwnWj-gfxx-13TJNVDoOqKl6TUVMx2xqHx9vs_1768289715 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZK7SP4ZUS7R624VKX3OE3RSRQIMONDGD X-Message-ID-Hash: ZK7SP4ZUS7R624VKX3OE3RSRQIMONDGD X-MailFrom: laine@redhat.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: From: Laine Stump via Devel Reply-To: Laine Stump X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1768289902516158500 Content-Type: text/plain; charset="utf-8"; x-default="true" This function checks two arrays of virDomainNetPortForwards for equality. It seemed silly to send a separate #elements for each array just to check for their equality, but I could easily be convinced to do it that way (rather than having the caller check for equal #element and then just send it once). Signed-off-by: Laine Stump --- src/conf/domain_conf.c | 53 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + 3 files changed, 57 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9ca5c2450c..d00a43e969 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21037,6 +21037,59 @@ virDomainNetBackendIsEqual(virDomainNetBackend *sr= c, return true; } =20 +static bool +virDomainNetPortForwardRangeIsEqual(virDomainNetPortForwardRange *r1, + virDomainNetPortForwardRange *r2) +{ + if (!r1 && !r2) + return true; + if (!(r1 && r2)) + return false; + + return (r1->start =3D=3D r2->start && + r1->end =3D=3D r2->end && + r1->to =3D=3D r2->to && + r1->exclude =3D=3D r2->exclude); +} + + +bool +virDomainNetPortForwardsIsEqual(virDomainNetPortForward **pfs1, + virDomainNetPortForward **pfs2, + size_t npfs) +{ + size_t i; + + if (!pfs1 && !pfs2) + return true; + if (!(pfs1 && pfs2)) + return false; + + for (i =3D 0; i < npfs; i++) { + virDomainNetPortForward *pf1 =3D pfs1[0]; + virDomainNetPortForward *pf2 =3D pfs2[0]; + + if (!pf1 && !pf2) + continue; + if (!(pf1 && pf2)) + return false; + + if (STRNEQ_NULLABLE(pf1->dev, pf2->dev) || + pf1->proto !=3D pf2->proto || + !virSocketAddrEqual(&pf1->address, &pf2->address) || + pf1->nRanges !=3D pf2->nRanges) { + return false; + } + + for (i =3D 0; i < pf1->nRanges; i++) { + if (!virDomainNetPortForwardRangeIsEqual(pf1->ranges[i], pf2->= ranges[i])) + return false; + } + } + + return true; +} + =20 static bool virDomainNetDefCheckABIStability(virDomainNetDef *src, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cb35ff06bd..83d49969d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -4099,6 +4099,9 @@ void virDomainNetInsert(virDomainDef *def, virDomainN= etDef *net); void virDomainNetUpdate(virDomainDef *def, size_t netidx, virDomainNetDef = *newnet); bool virDomainNetBackendIsEqual(virDomainNetBackend *src, virDomainNetBackend *dst); +bool virDomainNetPortForwardsIsEqual(virDomainNetPortForward **pfs1, + virDomainNetPortForward **pfs2, + size_t npfs); int virDomainNetDHCPInterfaces(virDomainDef *def, virDomainInterfacePtr **= ifaces); int virDomainNetARPInterfaces(virDomainDef *def, virDomainInterfacePtr **i= faces); virDomainNetDef *virDomainNetRemove(virDomainDef *def, size_t i); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4e57e4a8f6..ab2ab8afd2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -577,6 +577,7 @@ virDomainNetModelTypeFromString; virDomainNetModelTypeToString; virDomainNetNotifyActualDevice; virDomainNetPortForwardFree; +virDomainNetPortForwardsIsEqual; virDomainNetReleaseActualDevice; virDomainNetRemove; virDomainNetRemoveByObj; --=20 2.52.0