From nobody Wed Jan 11 22:17:12 2023 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 4Nshqs39qxz2sL8j; Wed, 11 Jan 2023 22:17:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nshqs1x3Lz3twL; Wed, 11 Jan 2023 22:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673475433; 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=3wa/xqpJ9qzAehy84T/Y5pHwPckHW5yCYZ6XVU9PeF0=; b=V4wjwtizpD1KzhzV3EaD8wH1pcf0RUK7165cV/F7WUs59o4AaJV1GANJpEAhnbDFMPWl25 4IzTzOX3LByyYuHQo4jhj0/74WpcpkfxnlKJgsx2kHLIjiTyLCrpcZ+EznIjnU8khuyGPs AzjRwbrG2JEHwPOJ8a8OxuuGmcHoYwT7Llhqlw/OiVahpmt4NZEF/ixqhQbO7y3gg4zsSB sEmKp25NbaT29cHqPl1wLodjXI0XdxfP3RUG3SDZ2GXHyVR206ASB8N+9CoX/LvM23RhsS pr6Bx4nDsxdkfToP8H4iLZSlN4rCO4rO+xSt3CbSDRTVjgHOzIXxfmX4C+LooA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673475433; 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=3wa/xqpJ9qzAehy84T/Y5pHwPckHW5yCYZ6XVU9PeF0=; b=dDRhpHPvteOsx1707BobeeUBv+JHtrz4bYbXyjahn5RjAU6Dz0MpRZtffBBUyGPUqIjQ1X UMycrepk1QZshURQRarCbJn++kzjbmjea2n4C31g3NcM0HmVokhUx5aR3F50BOritKj+5R gAEgsCf7db5pqt4GPD7WGwlIFSQWnuN6nzufb1Y/73qdv92ERiGNv92PL2goLdtRPhgQBv vCbjq/dAc1zlAha2k1zMbiRWkJN4ojE9/ylwkgYvIMtPGqLGxk/xa92Q5ga1MmKxDn8/er nTX4ZEIPsF9prZY9fA97lkSqivjFdi9+97sdyGz5Fm99UjALNrMmobHDz74tsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673475433; a=rsa-sha256; cv=none; b=XOrH2JA9QpV0x0WoEfVtQoRxvvCn+32WxWXsnr04WyRYFEQKl+jGOKrICBFzgFOChNFE3U e7hFatda2zQLbGpqHcLy0gjBwNoIkANoZrQaS+u4uHtz3STimXHWKa016gBH4CSEMK/51F eDYMYhJpej3XqhYfIheHCb2FzdpG8jEsLaSZsvellXlaUhDvrbzJ9E5hNp6OCAxnqkFS6p ZdP8OAuQEGtGiQ5E5SsWjhl6XZa5RCDEHVV/xTBjIDw7TrC2Og/WmXrQ8pzNC03esUDK1/ qoFpXcG8R47djmus2H8ifTuP4AFQ3TU9gQ3PCMa+0Q+orEIJw1FcRTAc53SKIw== 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 4Nshqs0fRSz14Xc; Wed, 11 Jan 2023 22:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30BMHCDt093435; Wed, 11 Jan 2023 22:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BMHCgj093434; Wed, 11 Jan 2023 22:17:12 GMT (envelope-from git) Date: Wed, 11 Jan 2023 22:17:12 GMT Message-Id: <202301112217.30BMHCgj093434@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: bf020787d5f1 - main - stand: Move dev_cleanup into libsa 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: bf020787d5f1b4a1274135b49309f7e9ef3955e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf020787d5f1b4a1274135b49309f7e9ef3955e1 commit bf020787d5f1b4a1274135b49309f7e9ef3955e1 Author: Warner Losh AuthorDate: 2023-01-11 22:14:17 +0000 Commit: Warner Losh CommitDate: 2023-01-11 22:15:14 +0000 stand: Move dev_cleanup into libsa Since dev_cleanup() walks through all the devsw devices with dv_cleanup rotuines, move it into libsa rather than having it in 'common'. Logically, it operates only on things that are in libsa, and would never be different for different loaders: either people would call it as is, or they'd do the loop themselves with 'special' things inline between calls to cleanup (not that I think that will ever be needed though). Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D38004 --- stand/common/bootstrap.h | 2 -- stand/common/misc.c | 11 ----------- stand/libsa/dev.c | 11 +++++++++++ stand/libsa/stand.h | 1 + 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index b16625774ce5..138e2e51ceff 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -381,8 +381,6 @@ extern struct arch_switch archsw; /* This must be provided by the MD code, but should it be in the archsw? */ void delay(int delay); -void dev_cleanup(void); - /* * nvstore API. */ diff --git a/stand/common/misc.c b/stand/common/misc.c index e1945b24be5a..e27191796a72 100644 --- a/stand/common/misc.c +++ b/stand/common/misc.c @@ -169,17 +169,6 @@ alloc_pread(readin_handle_t fd, off_t off, size_t len) return (buf); } -void -dev_cleanup(void) -{ - int i; - - /* Call cleanup routines */ - for (i = 0; devsw[i] != NULL; ++i) - if (devsw[i]->dv_cleanup != NULL) - (devsw[i]->dv_cleanup)(); -} - /* * mount new rootfs and unmount old, set "currdev" environment variable. */ diff --git a/stand/libsa/dev.c b/stand/libsa/dev.c index b273edb4457e..6d1834c8a14a 100644 --- a/stand/libsa/dev.c +++ b/stand/libsa/dev.c @@ -172,3 +172,14 @@ devinit(void) } return (err); } + +void +dev_cleanup(void) +{ + int i; + + /* Call cleanup routines */ + for (i = 0; devsw[i] != NULL; ++i) + if (devsw[i]->dv_cleanup != NULL) + (devsw[i]->dv_cleanup)(); +} diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index b5087d17e114..87b86fb98b20 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -193,6 +193,7 @@ struct devdesc { char *devformat(struct devdesc *d); int devparse(struct devdesc **, const char *, const char **); int devinit(void); +void dev_cleanup(void); struct open_file { int f_flags; /* see F_* below */