From nobody Sat Jul 26 07:08:44 2025 X-Original-To: dev-commits-src-all@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 4bpwnn0JTFz639Yh; Sat, 26 Jul 2025 07:08:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bpwnm6Cg5z3Jhp; Sat, 26 Jul 2025 07:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753513724; 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=zbA5Aqywq90pJU9osSzezNsQfe5LC7qyEtfXnuQKok8=; b=UKcbd4Rtt36s7m5xZ69B8SMTXRdWdgsrPD5rDO/dW+BXnCLe3HK3i6zkXgiD34bE9B46Px Id/i8cdFwyAl06lZUaLAFbIgIyyJq8nIfz/4ZSk1K/yje31lfObNVitQ0xMX8SAP7Smtq3 VahEy0OEYn1yL6nw6cHdw0Wii7C+I6xpEWaIVruRaTCJUl0/+wY/IEiomNNl+WCB/pjOT5 8SLyeTO9sEeNoN7YqJHwe3Zmka5bzGbTsInUyXRO0jlkdcUwrJ9oArEd4dPylB8D404hYr HuOZZLZoPImP5APT42yEnP07qtGSTf/NnVqLN6totxUWzx1WVUMajR4UW5enaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753513724; 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=zbA5Aqywq90pJU9osSzezNsQfe5LC7qyEtfXnuQKok8=; b=eEkc2OCAmGCYCne36vAE/A94b7OEAgoc8pTEDc081odOavV/cMwi6ZEeLSO4rUrglFe4eH 4bIefWWwg8rziqWOjGcAzBJi2n5s7kEXeVPLa3u+rtvU4EzaO9i6By81HK1tSYBpqckzHW zFbCM7dERum57/3TNOjtYUdxSxoYtCEi35bE7jFJ7CqkEm/RXgBf3pYIWyllaL+vLb9gdM TzPJkZmIGagBMDx0E4DCT7bLlBWZUUxAG1y/s04DnZdVsZ16tkwk+OrUoCAZm697kFiqpv 9MhsNOtsb6k7B4ca/rfImH60aSu+TwSR/sjE1Q8yfnMoEmvE1KiVKD0kgksiiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753513724; a=rsa-sha256; cv=none; b=OaOqYwpxPvbCKYDchUvA7WTSQKpmxoldCsyvRrz6nI6a8u+AfsmCfFh0k6zpx0/e7fY4nC e3eFRsL9vF/GgIzklyH1yHdLVvBguySo5cwQbZnNp6tuvBndwLKWMxFAAcT4PgVEqGESlF JbQ6PTz0xznPtEtF+VRzXhv40QV+mmeUfBoumZ1klW10wCq8vDqpf+y9AsJOtB2f/BbVVD aiZujC96TBKEaLnC90fvyjw/713LCqEgdV4aVMx0jB9L0JwUkDpOW0aiuLmsnWqioM8YWK kJyiF6mhEVo2DQ+O2u2/iLe0npTrbKwPpaEXVwHuSGw5AlpS8+9R2MGcZJ4Tlg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bpwnm5ZNpz48F; Sat, 26 Jul 2025 07:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56Q78iS0037062; Sat, 26 Jul 2025 07:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56Q78irs037059; Sat, 26 Jul 2025 07:08:44 GMT (envelope-from git) Date: Sat, 26 Jul 2025 07:08:44 GMT Message-Id: <202507260708.56Q78irs037059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: bbe75ea73442 - stable/14 - devd: Add vm_guest variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bbe75ea73442651b8e6277984b817308663193b6 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe75ea73442651b8e6277984b817308663193b6 commit bbe75ea73442651b8e6277984b817308663193b6 Author: Warner Losh AuthorDate: 2025-07-19 05:31:50 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-26 07:07:44 +0000 devd: Add vm_guest variable Fetch vm_guest on startup in case we're running under a hypervisor. Co-authored-by: eugen@ PR: 287873 Sponsored by: Netflix (cherry picked from commit bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a) --- sbin/devd/devd.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 28aab82803c8..e4abf0e33fae 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -154,6 +154,8 @@ static volatile sig_atomic_t romeo_must_die = 0; static const char *configfile = CF; +static char vm_guest[80]; + static void devdlog(int priority, const char* message, ...) __printflike(2, 3); static void event_loop(void); @@ -868,6 +870,8 @@ process_event(char *buffer) cfg.set_variable("timestamp", timestr); free(timestr); + cfg.set_variable("vm_guest", vm_guest); + // Match doesn't have a device, and the format is a little // different, so handle it separately. switch (type) { @@ -1323,6 +1327,7 @@ int main(int argc, char **argv) { int ch; + size_t len; check_devd_enabled(); while ((ch = getopt(argc, argv, "df:l:nq")) != -1) { @@ -1347,6 +1352,12 @@ main(int argc, char **argv) } } + len = sizeof(vm_guest); + if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) < 0) { + devdlog(LOG_ERR, + "sysctlbyname(kern.vm_guest) failed: %d\n", errno); + } + cfg.parse(); if (!no_daemon && daemonize_quick) { cfg.open_pidfile();