From nobody Wed May 27 21:00:32 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gQhpn1bXtz6fgs8 for ; Wed, 27 May 2026 21:00:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gQhpm5hzRz3PJf for ; Wed, 27 May 2026 21:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779915632; 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; bh=FmKEK5TO87cygLKVvQTmFIOkpLh2hQYj7UuM7fOysaY=; b=VgBRPNKnHhoEqIqCsHix4XijMxDOtCbm9S6a9r8S1UQrfWu5/+H+YReVD/TztfvvrZVv9k mx5m3H4rxRbZzQMMJlBXDclN4VMAr8S1sbFJxiQ6tnmqefBHHuKorb9XakXNXREnMNufSK pyZ35t8O1AWpg3Yklmyv7U0K/VNc6cRfRPcEQ2XH8AJWYOOCwrkc6LYWqJ8AYtpprIiFhx xBPFbDKcAw7ebqoV1LsOERY7oKP/xpo82vOoVbZD8XPWKMu+pFD+u9nEqDyiAu272CutwC MFlX4eIjVydkctqDjF4uVzuukGsCyoK/8GjYfgrnAakBwWaOT0Q27LgHWhY5JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779915632; a=rsa-sha256; cv=none; b=oCvRELw9hhAZGwLlx23autKNkvti4QURn5yaS+6MNfzmSfz8q/xtANfa6yKLVrEdG8f85a HfKGTCXdQ9UWGJq/ZeU3xi8N9aeynoN7dfjJ6yIyn4X16YigNUtl9t20ic5hQ+SdwwsCte cj1FlT4JahhYTg00aznvJ5ehCZKPOdMkdpdS/HtEFKwP8hNRD2sYQIeWYJo34N16+OCjBS V5/4RTcXpM8aXelzE1Q8cKE9SLH4+AwTspNONDliXiWjw8PgO3SXz7goAYliVo9QsvMGtJ 5Crda6nOj6irhzhl4nQtSJKc+eXbDRzWyY5WVoacbiq9i4hBCf5OyxHv/FoVLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779915632; 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; bh=FmKEK5TO87cygLKVvQTmFIOkpLh2hQYj7UuM7fOysaY=; b=EVpJxbn+d0FUAl1SNwjVD6RtMF+mfIMNmi1sSAmxjoBnyM0g6YAjaQvpa0uVmxT+87CqG7 RYTI5qqyWM38yGalNwGxl/nGDhM3/LR1BVD7+Tj0d5L/ieGoQLUPuFc/oGcELlYG8PESr+ LSkBKvD679SmrGRo0JcRo0Vx59AiNoHKejPKBLr7KJRPawxh2g/Al/9UArVNK7f4ZtmWQA BxYCd8Nfzzl+GrKGEW5FTXbum3qxXxaG4msTEflpAwtJtYIFdasx57nLVDPTWadiCmJIJe COioszoYI9+cCrBqW8L0VbSHfQVE3GBIVPZBJFCekClWHWFfs3MRcO4KoMgi6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gQhpm4m3gzvR for ; Wed, 27 May 2026 21:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22673 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 27 May 2026 21:00:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7a436d378951 - main - ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a436d378951bedbdaa71d45bf236fb001323549 Auto-Submitted: auto-generated Date: Wed, 27 May 2026 21:00:32 +0000 Message-Id: <6a175b70.22673.65ed394f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a436d378951bedbdaa71d45bf236fb001323549 commit 7a436d378951bedbdaa71d45bf236fb001323549 Author: John Baldwin AuthorDate: 2026-05-27 20:56:39 +0000 Commit: John Baldwin CommitDate: 2026-05-27 20:56:56 +0000 ctld: Don't ignore pp/vp values of kernel ports with pp == 0 but vp != 0 Fixes: c6f1e9b8a412 ("ctld: Simplify XML parsing memory management") Sponsored by: Chelsio Communications --- usr.sbin/ctld/kernel.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ctld/kernel.cc b/usr.sbin/ctld/kernel.cc index a6b0a79850ec..59a339e1c96b 100644 --- a/usr.sbin/ctld/kernel.cc +++ b/usr.sbin/ctld/kernel.cc @@ -549,7 +549,7 @@ conf_new_from_kernel(struct kports &kports) continue; std::string name = port.port_name; - if (port.pp != 0) { + if (port.pp != 0 || port.vp != 0) { name += "/" + std::to_string(port.pp); if (port.vp != 0) name += "/" + std::to_string(port.vp);