From nobody Sat Jul 26 07:17:19 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 4bpwzh56XMz639th; Sat, 26 Jul 2025 07:17:20 +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 4bpwzh0Jf2z3NwS; Sat, 26 Jul 2025 07:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753514240; 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=I5b5E3u8lfgl6QFS6HpAi5O4whYsX8nwpNtTkJSmWEI=; b=slesqGN6xeezd6JAdHIqAXCrvg7QIbhFA1cSSG+ahJ+x0GWtQHKOe/NGxSVbxzzQicMZYY 7mRT1szh9KrGWSG8+ZGBFLAa6e4AFBUagP52H7qdWsTd9a1rP/zt+lydPrQyhXCT61I2Ds j7aqoBan66VVRN+7ZvlYgyINbJbzdl97vmy7xB95N1v3t+VWrN2VKLrrGUy4L5zWXzHpBt YOv2Ok2IrDM1mYxhILEzJIQ2ZXLw/z1DNFTgJHT1y+rjgq4oHUS9BPFoLtd+/xzo1+HAym XgbqMn3IWoZ9Y976a+KQE6qUyMLsLWFH6EuUEX6CRJDPMOb+K9xWN1uQRbmL4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753514240; 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=I5b5E3u8lfgl6QFS6HpAi5O4whYsX8nwpNtTkJSmWEI=; b=DgWPfjJyhB8ABjq0gaVJxSFSbrjTWhQn2v34WEUYbhW8FVsVQaq3cqs5/QqiP6klZ2IZS5 zZ+s40ewXFLxlL+LCuK1LCTONXTEejvsLE+jbjju5yasCDiWeGaq7VMhWKg5r/dCq0vLX+ 7wqFKXZX5s7rLYCTV+v3Pfi/nEeptn5/XSmYX6x7kmsGVBPZBy6xHaqWVwcBxPJ6z6IbfY 4EMP83AsGle1RpF7T+5KCczmvROjHMfJ+GWE8MkfNM/8CwGcmxeeV/ZWm2kM9kxscqNOqO mbWchnItWFKHw0JVH0iDf4Ct4f5AcBcWXB1roGZ1I45tuS/3jyDqrcZaMvvz3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753514240; a=rsa-sha256; cv=none; b=HAUlSYVPa2/d7J8cWqxAupX789mtYJk+3WxJZB2vSx7nUsKvbI3WZXDhozUtpEEuSs+Etj 8buyBvB/pv5ngLAgFWQlC/hYSXlaxCemnq/MXfNb65fmnbXukE4lKvAx21yUCfIfn3UAm0 GnrTpifxUh15Qv0RZfj2OqRaLZLeVcL/JsDl6feaCUbPNW7zGL+d8pd7AlS/NOG98PAP42 MW1eSe+gPsZ4Wvhh1E1YEPeC6NS6lmoWi8dWBEsAHIqS6HiY/od+TOlMMYmP24esSHY2kC /ZpriypmryGqSXj3fq94Y5MWwsjo61yptOPmjG4wtXpFY01knbOPcfzsHkg5vQ== 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 4bpwzg6lDLz4mG; Sat, 26 Jul 2025 07:17:19 +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 56Q7HJ4C055713; Sat, 26 Jul 2025 07:17:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56Q7HJlx055710; Sat, 26 Jul 2025 07:17:19 GMT (envelope-from git) Date: Sat, 26 Jul 2025 07:17:19 GMT Message-Id: <202507260717.56Q7HJlx055710@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: 0111be0a4092 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 0111be0a409294763a1bfda21f4bff2b26545cb8 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=0111be0a409294763a1bfda21f4bff2b26545cb8 commit 0111be0a409294763a1bfda21f4bff2b26545cb8 Author: Warner Losh AuthorDate: 2025-07-19 05:31:50 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-26 07:16:09 +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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index c1b3e032d3e5..139bb912881d 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); @@ -855,6 +857,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) { @@ -1289,6 +1293,7 @@ int main(int argc, char **argv) { int ch; + size_t len; check_devd_enabled(); while ((ch = getopt(argc, argv, "df:l:nq")) != -1) { @@ -1313,6 +1318,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();