From nobody Sun Apr 19 12:42:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1776358613; cv=none; d=zohomail.com; s=zohoarc; b=jVLe3hgj9iBiVkACLAbTB26MMpDq1C0AaA5puaZDHIYalzii2Ol8JsiadoLXZAXIHH9RO4PDF74WWjA30xY3WLxo51TIi8Pu6Dw3CplDbLGzfsEOhvhQa+NXO3b1WUowxI0cD5d5JvetA1jssep/c0FiHvg6guq8lXgv9Q9Rcac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776358613; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=p2P5lYyLDGUPrSfaYjVMionljQZ3pigRiFWgbLT4bts=; b=bp+PvFxQvGu7dWyWV03dOpH7Qeanu960EQW7Q6/EQ9VBXJP9yL0DC9vb5IxOulJ1w0ysWr8A/Zj6TEOAZQl8RuYngYlK/wqRYZLeCvSVZxYOvEnf++QMQ0c/x5hFpROHnppwglkLjC5gtgiFw5xZssWRyvlE9Xyg+ONzEiwK2zY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1776358613088806.5633961301759; Thu, 16 Apr 2026 09:56:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 27AAE417E8; Thu, 16 Apr 2026 12:56:52 -0400 (EDT) Received: from [172.19.199.6] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 1A0E5418CF; Thu, 16 Apr 2026 12:55:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7A7AF3F308; Thu, 16 Apr 2026 12:55:38 -0400 (EDT) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 9A0F53F2EF for ; Thu, 16 Apr 2026 12:55:36 -0400 (EDT) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-671c5eb7fb0so4502360a12.3 for ; Thu, 16 Apr 2026 09:55:36 -0700 (PDT) Received: from tulp.my.domain (2001-1c02-1a15-3000-ee82-4536-a8f2-9e22.cable.dynamic.v6.ziggo.nl. [2001:1c02:1a15:3000:ee82:4536:a8f2:9e22]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-67237d78933sm1471081a12.6.2026.04.16.09.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Apr 2026 09:55:33 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776358535; x=1776963335; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=p2P5lYyLDGUPrSfaYjVMionljQZ3pigRiFWgbLT4bts=; b=o2w5th28EWwhDqPFRqRwhSF9z/jq/z1MPyegrzThWmAHXL9GtVcncXgEw273V/8y4+ 8e5QW6X+yr3tvsxfhzpGhA1Gw6+m9ae4AD/3aX7L+PCefGS4JW59+uz9pOzTOGZhhaTu zwu/R8OvBFt5dRUb709MVL4qlBYiZRR4xtCNtG+y5ReyE6MWonlx+DumSt4LQAUP8Ac3 zzwrzQf3Zhpnn9ZbA6+/7b/NRyMKycLz44d46TcO7EsNT6vjaLRSUInKHSn7z/lreLe8 F/DnCFwFi9Nek1ti6qmuc2XOlN+UgTcyigGSJj2JsFNk/WCF1gCRIMSlyqEwAWjFymVv vB3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776358535; x=1776963335; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=p2P5lYyLDGUPrSfaYjVMionljQZ3pigRiFWgbLT4bts=; b=ZVLAR+EJSXX6EoJ/vDvuftY8/zNKsLrCgenoVEHtYAbXFNOorvYBfG0LI6qiF9TdLE zM6y4Y5g0PVJe81xVmjo6efvWaOws4uCZ+JvMjG0fLKon93qnw7fsH0IvoSaoAVwKgcB dCw1Obk9IrfaODA8xZ064ccQ1LGDrKSm+nUbZ3ykhzi0j2D9ZgRtSi+McMemWdjGTKi+ lejbHZeE3BP+sorX20g9naAYff+wFL+gjgLQ0FV5mjCMib7VRAE09anUpSIJ1wQFqapo jYx8QhM12qteYMXuhxdoHd7Jzx2nGKKz3N+pnKFYL912lXqwolp79xTIRiAzZ9f874aI 1DHw== X-Gm-Message-State: AOJu0YxZm5cAD719IpvBgl8MpknqsvMI11UpSITKmGl/FyYm3DJNK1k+ qOuGiyBKI5i40Bp811JCN1P/WETSIgm9vO5sNnQX1KWNKscDH8Qy36MH6eS+mrbn X-Gm-Gg: AeBDieuYRIjmfHaqng5q8zi3v2Wo/eFwyhc3dRs0e5oDVus39TjHfk8vuSXAzjeULpw gMytlNlQhY+I23VnoxyJwUY2rL6wjtfXLOPcH7nKGloeWdaDB6/a3jSvYw+e2Di2mFK1NCIW60f xI8x2xHOEXzQD5CWgykQj1MAXmQ+NcJ7KhqFXKYBw9Avsj+74GuEdyPchLkFGIARuxnpCBb/BmR Wj8bOhdjMeRlsvHBk1ISSjuMYY6F8QrfE8MIP+pKte/hVGt3SPyBmkwp0G8r8Z78HGI9iy5zxZt HS8I8RcdyFqLGWdp9ZtyDdZRlrq4ctcd54tZtuvKECEevdLZyTq9JXSeib9mUsOACoEzMINekwf rVUc5SpLPKnGjefZ1TiPQA/1BEEzfbSuOGLj1qiTAP1sXogwywQzlQ0KacZ/Yt6sXPhSI70nJ+7 mmxmrMX4+qJX9dEfW2/a7HWHJpw3yI8UjYmivzMyB/aM1ZxYsoNc5w2OBrK0bW4AHAMe+nota4T Z7mUOgpQq/aR5TsS+EpyzrNY55pWOk1I2q9Dw== X-Received: by 2002:a05:6402:a0d5:b0:670:e9ce:16a with SMTP id 4fb4d7f45d1cf-670e9ce0387mr8721117a12.23.1776358534292; Thu, 16 Apr 2026 09:55:34 -0700 (PDT) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH v2] virarptable: add FreeBSD support Date: Thu, 16 Apr 2026 18:52:42 +0200 Message-ID: <20260416165242.14176-1-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QWUYJQZG35IO7RST7D6YMFJAHTP2X6DS X-Message-ID-Hash: QWUYJQZG35IO7RST7D6YMFJAHTP2X6DS X-MailFrom: bogorodskiy@gmail.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 CC: Roman Bogorodskiy , Michal Privoznik 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 @gmail.com) X-ZM-MESSAGEID: 1776358615071154100 Content-Type: text/plain; charset="utf-8" Add a FreeBSD implementation of the virArpTableGet() function. Update the bhyve driver's bhyveDomainInterfaceAddresses() to use it for the VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP source type. Signed-off-by: Roman Bogorodskiy Reviewed-by: Michal Privoznik --- Changes since v1: - Replaced custom macros with SA_SIZE - Dropped RTF_LLINFO, it's deprecated on all supported FreeBSD releases - Replace g_strdup() with g_steal_pointer() src/bhyve/bhyve_driver.c | 5 ++- src/util/virarptable.c | 89 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 93c07c6945..c8dd1a728a 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1868,12 +1868,15 @@ bhyveDomainInterfaceAddresses(virDomainPtr domain, goto cleanup; =20 switch (source) { + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: + ret =3D virDomainNetARPInterfaces(vm->def, ifaces); + break; + case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: ret =3D virDomainNetDHCPInterfaces(vm->def, ifaces); break; =20 case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT: - case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("Unsupported IP address data source %1$d"), source); diff --git a/src/util/virarptable.c b/src/util/virarptable.c index 20d11f97b0..53cfea7dae 100644 --- a/src/util/virarptable.c +++ b/src/util/virarptable.c @@ -1,7 +1,8 @@ /* - * virarptable.c Linux ARP table handling + * virarptable.c ARP table handling * * Copyright (C) 2018 Chen Hanxiao + * Copyright (C) 2026 The FreeBSD Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,16 @@ =20 #ifdef __linux__ # include +#elif defined(__FreeBSD__) +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif =20 #include "viralloc.h" @@ -145,6 +156,80 @@ virArpTableGet(void) return NULL; } =20 +#elif defined(__FreeBSD__) + +virArpTable * +virArpTableGet(void) +{ + int num =3D 0; + int mib[6] =3D {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, 0}; + size_t needed; + g_autofree char *buf =3D NULL; + char *next, *lim; + struct rt_msghdr *rtm; + struct sockaddr_in *sin; + struct sockaddr_dl *sdl; + virArpTable *table =3D NULL; + + if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("failed to get ARP table via s= ysctl")); + return NULL; + } + + if (needed =3D=3D 0) + return NULL; + + buf =3D g_new0(char, needed); + + if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("failed to get ARP table via s= ysctl")); + return NULL; + } + + table =3D g_new0(virArpTable, 1); + + lim =3D buf + needed; + VIR_WARNINGS_NO_CAST_ALIGN + for (next =3D buf; next < lim; next +=3D rtm->rtm_msglen) { + rtm =3D (struct rt_msghdr *)next; + + if (rtm->rtm_msglen =3D=3D 0) + break; + + sin =3D (struct sockaddr_in *)(rtm + 1); + sdl =3D (struct sockaddr_dl *)((char *)sin + SA_SIZE(sin)); + + if (sdl->sdl_alen && + (sdl->sdl_type =3D=3D IFT_ETHER || sdl->sdl_type =3D=3D IFT_BR= IDGE)) { + char *ipstr =3D NULL; + virSocketAddr virAddr =3D { 0 }; + virMacAddr macaddr; + char ifmac[VIR_MAC_STRING_BUFLEN]; + + VIR_REALLOC_N(table->t, num + 1); + table->n =3D num + 1; + + virAddr.len =3D sizeof(virAddr.data.inet4); + virAddr.data.inet4.sin_family =3D AF_INET; + virAddr.data.inet4.sin_addr =3D sin->sin_addr; + ipstr =3D virSocketAddrFormat(&virAddr); + + table->t[num].ipaddr =3D g_steal_pointer(&ipstr); + + memcpy(macaddr.addr, LLADDR(sdl), VIR_MAC_BUFLEN); + + virMacAddrFormat(&macaddr, ifmac); + + table->t[num].mac =3D g_strdup(ifmac); + + num++; + } + } + VIR_WARNINGS_RESET + + return table; +} + #else =20 virArpTable * @@ -155,7 +240,7 @@ virArpTableGet(void) return NULL; } =20 -#endif /* __linux__ */ +#endif =20 void virArpTableFree(virArpTable *table) --=20 2.52.0