From nobody Tue Jul 22 04:00:53 2025 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 4bmNps5bxCz62NN1; Tue, 22 Jul 2025 04:00:53 +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 4bmNps2Fxmz3cWJ; Tue, 22 Jul 2025 04:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753156853; 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=xDy6es3aLvM5Q3tgyHWZ4Y8ki/fSOd8/FzzBbxKTReA=; b=r1iaAb7dVdreQvFhejrCilJKq8Bgs39pXgWcBe98jb2jph96sZbYNHl4AZ35/hCmP7Ps5J mZD4B3RLaXBkV4mw+5y7rnOcS4H4ouuWRQ+L2AxB3Zs9XzToai2Ykq+3WBnlnaSreuqQ5z 4L53MuRezqC4ORHhHnQF7uR6uhYD/v3OOV83i9SIPB2ppTwoRzRNXNVDs2vs5GQCgRLQCR jW8jwCLQwi7fdulJGzuHeZcFCJKoclRTXY6vIYuMC5PLDtXgCDNX1cWitCraiCXHjty8hc 9QZwRmebEIthEeYMSUQwPRLcw3AZkE5/yZZNRWa+oLfQuihhvetQgX66s+YAdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753156853; 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=xDy6es3aLvM5Q3tgyHWZ4Y8ki/fSOd8/FzzBbxKTReA=; b=nEyad80W5ZDLzqDQ0IvPg8Y4Nms3RSJP4L7qq++LrxfRFCd50pnwqXtrbr7JDjXXx+cRON LkykcnqfmFLK6z0LJjUXTbjWgZWJwZYnPlBnaJgBxAs2k3d2OflOcpQySAiHxaFWyfJQTE 9TlAD62iIDaW6K8iZPxTJ7PS4orCfMpnTR1D30U5Pwk1E9Mk7qQ/aSPayE4L1aKTqs5iSd h9L/Wlb918GCV33uef/y65XGUSR/gOwiB74hhWI2YMFu+6S0FsWYCoQfJsWrLk6aYqNpDG pbo4ktongW6wiiDaSEgXepahb6vdS9MwRa9aQycKZ3YfWd+GUpF/Q9KHPFS8/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753156853; a=rsa-sha256; cv=none; b=HKaSpl0IHa2UxhRmDKPtgBwkI9kMcwkMHzRgWlnV2uc2cukL5bjj3rCXWk15CvjG8UjCgj gYycSHH8n99i4LdOk6UyNDFVvamPnicHgAGJoFhOZtfooU4HtUWweV/LF84AEU+6eMAuHu xEP6rnf41X1SUveAUBmfOa364aBs+huxZN5iBhVEaqFLQNFsQyKluYRVJ9Q5jwac37anHc 7BbBOyKXv0Ug+WqcXp5OYeNgEvQXHqMZ7GxPy25K4FBsKUqpZTGh4iwOP+YpiUPzaxvSZ/ RjH0s0hKfQ1bsOrOIG+xugL/Mw2y2JGvFAYloTwi20dx7gbuTnJiFMnfaATVSw== 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 4bmNps1X5zz1Q7b; Tue, 22 Jul 2025 04:00:53 +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 56M40r70032479; Tue, 22 Jul 2025 04:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56M40rlf032476; Tue, 22 Jul 2025 04:00:53 GMT (envelope-from git) Date: Tue, 22 Jul 2025 04:00:53 GMT Message-Id: <202507220400.56M40rlf032476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bd4a4e46ceac - main - devd: Add vm_guest variable 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a commit bd4a4e46ceacd8dfc5a5469ec6edd8c92c53605a Author: Warner Losh AuthorDate: 2025-07-19 05:31:50 +0000 Commit: Warner Losh CommitDate: 2025-07-22 04:00:33 +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 --- sbin/devd/devd.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index d7a3fee57870..375ccd817146 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -153,6 +153,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); @@ -867,6 +869,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) { @@ -1322,6 +1326,7 @@ int main(int argc, char **argv) { int ch; + size_t len; check_devd_enabled(); while ((ch = getopt(argc, argv, "df:l:nq")) != -1) { @@ -1346,6 +1351,13 @@ main(int argc, char **argv) } } + len = sizeof(vm_guest); + if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) < 0) { + devdlog(LOG_ERR, + "sysctlnametomib(kern.vm_guest) failed: %d\n", + errno); + } + cfg.parse(); if (!no_daemon && daemonize_quick) { cfg.open_pidfile();