From nobody Mon Dec 30 18:52:41 2024 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 4YMQG1473Zz5hc0F; Mon, 30 Dec 2024 18:52:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMQG13Ydrz455b; Mon, 30 Dec 2024 18:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584761; 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=CT45DGUxeTccbRpCYSCmQoARWpH9G8UnPBbQ6ydEyAU=; b=MIpWzQC4QuJHn5KKu/uuMTMiopY4gx2Uv1Nt0VKu/AhwhZtnemqnxNZQhsEgzqFb5YaMhR 5syBKdNNqvV8q+GhBjhnKsr8VKpgqes5xKOpI3OawE/AJWxYx+4r5IHBCLhigbN4Fod6g+ StKgPq0t7N3q8BfhviON7XtaCxpq0NMnkLYtxBSQz7uPdlRRr11tmejLFupusFj32xJs5a XF9V6/9sC1w7MPhUtfYWocLpi47acXLnwnXDP81yqnoT+GqtU2L70qF1nue7+/+u+daGIP lu7YbD0Js6W7UIgtFZO8MPYEjtbFdrUnkdYB2yX1FSCD1JFGZkWwruI6gJdyqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735584761; 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=CT45DGUxeTccbRpCYSCmQoARWpH9G8UnPBbQ6ydEyAU=; b=bjbS5IwlQjNi9efX5qIvelB31UtzbIFADnSPRgaKAg04YsmOAPPVSuph2SLyOaqJExNfZF e7Qz8l4tuc6O7ObTa1jow/G07i5AlkRvZlxOHc2LG3kz4HcrWrcIzXfPVgfitbbf0akPKD KRUDsuTUSBViyQWFo/SRJDBVBm99uLuIttA6aSqR/pwWApgJhxq49GRuRcsLy1W5S5XvHW 1T5Fxje1o+Peer+2SzdGu9YwvRCTEz0989SYXiSWexxGzVGaZ8HgDba3bwK0vS9MIROO5R zKyCne+2QnzkKWfS7QoY1vT8N6H5Ob/QOh2q3ILFdBo7Lyhpn5QBxROR2QHpJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735584761; a=rsa-sha256; cv=none; b=M4RCtdBwl4DHX3hfnynl/DgusATGP9UsJ4zx6V9IJ95WWVTnTd4gBrIcuYLSnXuJXAnX7J YX9Y+IM86gGdJ1NIRdEZR5B30sFlA0r7axO8pqK9sFPj1gxxTaaH3qehScejwC7k91kOkp Ipa+mIft6mAjbOjMyeLGtab6aepqHPTwNjWYi8H5OESSmhNcUTbl5Z41PJjomm5bVfHy3A BOlpZigIDaNA/xlLt3HGdDp86yWiLVPWkRGCo6Vq0sRwqanpdaAx2DJiar23YnuPR5yQ6L SKe2HmRlW8DY1gC11cTHM7nsxo3AgfW3a+kuW1p1/Xr9TbbA5gJOsJzbqAlb1w== 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 4YMQG138gjz14w1; Mon, 30 Dec 2024 18:52:41 +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 4BUIqfk1012407; Mon, 30 Dec 2024 18:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUIqfIm012404; Mon, 30 Dec 2024 18:52:41 GMT (envelope-from git) Date: Mon, 30 Dec 2024 18:52:41 GMT Message-Id: <202412301852.4BUIqfIm012404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8a50aa09019a - main - nv: Add header for nvlist_t declaration 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a50aa09019a4230374f48c2f7411342f26b7475 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8a50aa09019a4230374f48c2f7411342f26b7475 commit 8a50aa09019a4230374f48c2f7411342f26b7475 Author: John Baldwin AuthorDate: 2024-12-30 18:51:48 +0000 Commit: John Baldwin CommitDate: 2024-12-30 18:51:48 +0000 nv: Add header for nvlist_t declaration This can be useful for headers that wish to use nvlist_t pointers in a structure or function argument without pulling in all of the headers from . Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48229 --- sys/sys/_nv.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ sys/sys/cnv.h | 8 +------- sys/sys/dnv.h | 8 +------- sys/sys/nv.h | 8 +------- tools/build/Makefile | 1 + 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/sys/sys/_nv.h b/sys/sys/_nv.h new file mode 100644 index 000000000000..2baac37f7715 --- /dev/null +++ b/sys/sys/_nv.h @@ -0,0 +1,45 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2009-2013 The FreeBSD Foundation + * + * This software was developed by Pawel Jakub Dawidek under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef __NV_H_ +#define __NV_H_ + +#ifndef _KERNEL +#include +#endif + +#ifndef _NVLIST_T_DECLARED +#define _NVLIST_T_DECLARED +struct nvlist; + +typedef struct nvlist nvlist_t; +#endif + +#endif /* !__NV_H_ */ diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h index 7741a64b9037..095533d08351 100644 --- a/sys/sys/cnv.h +++ b/sys/sys/cnv.h @@ -30,6 +30,7 @@ #define _CNV_H_ #include +#include #ifndef _KERNEL #include @@ -39,13 +40,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - __BEGIN_DECLS /* diff --git a/sys/sys/dnv.h b/sys/sys/dnv.h index 93ba9429bfc6..8ef10a184ad6 100644 --- a/sys/sys/dnv.h +++ b/sys/sys/dnv.h @@ -32,6 +32,7 @@ #define _DNV_H_ #include +#include #ifndef _KERNEL #include @@ -41,13 +42,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - __BEGIN_DECLS /* diff --git a/sys/sys/nv.h b/sys/sys/nv.h index 6219eac6a827..fe7e6ac10891 100644 --- a/sys/sys/nv.h +++ b/sys/sys/nv.h @@ -34,6 +34,7 @@ #define _NV_H_ #include +#include #ifndef _KERNEL #include @@ -43,13 +44,6 @@ #include #endif -#ifndef _NVLIST_T_DECLARED -#define _NVLIST_T_DECLARED -struct nvlist; - -typedef struct nvlist nvlist_t; -#endif - #define NV_NAME_MAX 2048 #define NV_TYPE_NONE 0 diff --git a/tools/build/Makefile b/tools/build/Makefile index faf130f3d99c..f4bb383693a8 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -275,6 +275,7 @@ MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h # Needed to build config (since it uses libnv) +SYSINCS+= ${SRCTOP}/sys/sys/_nv.h SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \ ${SRCTOP}/sys/sys/dnv.h ${SRCTOP}/sys/sys/nv_namespace.h