From nobody Tue Apr 08 13:41:11 2025 X-Original-To: dev-commits-src-branches@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 4ZX6fw3LYrz5sQRT; Tue, 08 Apr 2025 13:41:12 +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 4ZX6fv2g6Dz3DqR; Tue, 08 Apr 2025 13:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119671; 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=Qhvcd5yAf8N/Z93EJAHAEa6nhKgJEuWeLxv7T/+Oaqc=; b=Z4D9xIWmAewlgDdkCVn3ukzflmmz1TuUK0O9/OeL3aW2Cy0AvS0ikGIUPXW3WsARdZZIF8 t/ReRu/cDyzEHq765fCD8BGAISblo2LrsIRityyUilAR8ZeZiN/KfmTykBNeSobCe10X1/ 4otacR4phC6M8/hs70ueT8H/+Pv8hVCv6ytE+DmTvHONrGh8a6csrqpjOaz/mfS2fg186m QgTDhpDpV9MC1jvCMJTuwGbBrQ3P/9wv+pYNqykPdGVJbyS0fcDS8s6Bz7WjY/j+JAH8dP uwgxT5/w/rTglWmcy6/oa2/ci30iiXcWMG9h4iL0Z8mvDVXLXfI/+Au1yXacVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119671; a=rsa-sha256; cv=none; b=G/LJ9omsrH+Qsgvr6LfIRfcufGabSsI8J1fFmEaDzpd3zykfDkNGE2GGo5uC0hAkxQoIzq r5ypn/ni/AlFQzFbBmIwgoRhVH34O+7p/7WX1UfE6wEs6wWEj1j3APGBny8K2omfcPr15O La/cKctKWlEFCThEdLct32GPdlRy83dpqUqCQbqPrNZ0RwzSrIMkEgMnoT9qqlgd3sWEkX Uki0lsB6BYV5v1DdlPC8dOCqk3GZ0GTdDAGR9ADzkbteFKi8eOJ4p8uDEli7vjQspsA0DL 3S6VhHADclhuALsKbmi0U/k80hO2b5956/uWlZ82wFZCg9VTmTygn7zyPtAxQw== 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=1744119671; 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=Qhvcd5yAf8N/Z93EJAHAEa6nhKgJEuWeLxv7T/+Oaqc=; b=S4MYfYH1ufYLc6YJc+jg380uHRFB/bVKNmd3Zlvc8Zo6L+kyXPJlph/AycXtR34Udhn8Mm H92Xq6hYD2RDHm4OCZATLpO41gjyqeAZ0T4eZI/OOL8qyyJBYU24lrHVbrun8bmSLty062 cSmQkkXgng/R8sHljPCzIGT5foNHhcrkkM3tltoctcYFj3iEj8xHGsAqJ+IPv1a1Il7Kk+ 3BZJNj5JA6U6RaakY7AvWs5x+C2pmMwlapBZIKaiNJ2hOo9TXHvpjHGtoa/v521tSWaH1m iq0x2NGHxi76FLwLldFz7CCewfuVy4iwytk3Qtgdtp991u2kwo54mZpkt3hkQQ== 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 4ZX6fv26JNzbJj; Tue, 08 Apr 2025 13:41:11 +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 538DfBaL034506; Tue, 8 Apr 2025 13:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DfBCD034503; Tue, 8 Apr 2025 13:41:11 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:41:11 GMT Message-Id: <202504081341.538DfBCD034503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d19f1559d008 - stable/14 - libsa: smbios_detect(): Return the entry point address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d19f1559d008290f87d303b22833f66eaef61e36 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d19f1559d008290f87d303b22833f66eaef61e36 commit d19f1559d008290f87d303b22833f66eaef61e36 Author: Olivier Certner AuthorDate: 2025-03-05 10:27:50 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:28 +0000 libsa: smbios_detect(): Return the entry point address In particular, this allows the caller to know whether the detection was successful. Reviewed by: imp, markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49290 (cherry picked from commit 9dad0ba286807c4aa2886f13705fca2334bb4759) --- stand/libsa/smbios.c | 6 ++++-- stand/libsa/smbios.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stand/libsa/smbios.c b/stand/libsa/smbios.c index c7d9f1074fad..54cfac58b19e 100644 --- a/stand/libsa/smbios.c +++ b/stand/libsa/smbios.c @@ -635,7 +635,7 @@ smbios_probe(const caddr_t addr) } } -void +caddr_t smbios_detect(const caddr_t addr) { char buf[16]; @@ -644,7 +644,7 @@ smbios_detect(const caddr_t addr) smbios_probe(addr); if (smbios.addr == NULL) - return; + return (NULL); for (dmi = smbios.addr, i = 0; dmi != NULL && dmi < smbios.addr + smbios.length && i < smbios.count; i++) @@ -667,6 +667,8 @@ smbios_detect(const caddr_t addr) sprintf(buf, "%u", smbios.populated_sockets); setenv("smbios.socket.populated", buf, 1); } + + return (smbios.addr); } static int diff --git a/stand/libsa/smbios.h b/stand/libsa/smbios.h index 77dd6bd52a7e..f3fd394ec7fc 100644 --- a/stand/libsa/smbios.h +++ b/stand/libsa/smbios.h @@ -26,7 +26,7 @@ #ifndef _SMBIOS_H_ #define _SMBIOS_H_ -void smbios_detect(const caddr_t); +caddr_t smbios_detect(const caddr_t); int smbios_match(const char *, const char *, const char *); #endif /* _SMBIOS_H_ */