From nobody Wed Nov 30 22:31:16 2022 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 4NMv7T2Vjhz4jCPg; Wed, 30 Nov 2022 22:31:17 +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 4NMv7T1kfQz43n6; Wed, 30 Nov 2022 22:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847477; 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=TNPylGACn3Yonx0f/Z81O4jctb7UxlYhUJNDAWu+FgI=; b=kgcEsoiz2J4B4+2jCtqbEz19H7Ql6YsCw3rKOPiwU0A9UQV+hODT9IT0WCfzQ69rKdzoXT lH21Xb8LN4ljzUzGnMsncm8bWEV0MsYw8cUelKkD/SD1yemsWCfbdfM10Edhsja+rtBFKo +XFy6WyGEDEtb+DSwA+xJ7aN26Qk4cgqzxaXX16SXUz6llVMlaKnYqP0iDKNYh3jMff1Sk Uj5gIvQALuAk/4ee5xB+UaCc4jXxGkXACnYSA/j0mLk5oykTuvk5iZ2Udpx5iiY0q16zj+ GELzVGT9xEKqKkNvrBMt1I3Yq9pxl/tYeEQfXJA4pkrBjjGVcFL92a50TMT0lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847477; 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=TNPylGACn3Yonx0f/Z81O4jctb7UxlYhUJNDAWu+FgI=; b=mlWTRS0+ujXvOy9BSW9Iqk6Z0kJGFPwwxIJRqjolsGpWZzDBqjPeW6fMrlFj4zKZvU8uI1 sQ/ukTvNZOKOWwQrVUBWWwqL02TM0B3nPHsR2CZ2DvzwE5l4ewq44tBUjepvqEeFQtbpeW 7ge0qHmHXD5am1hH4RbCYAFzWlZG8Yyn6dqpsOoodFNMDUYPKZHAReOES4FYl/8KaOVrcK oAot9oWPKMlnCtyCAujTHr8aZH7vPITFWi4zMRb3JISxokVQ+/ENwbBIrHogsQhIDIc6BR 8oiY8FG5mi39FMKjxg4Ct+nUA/5QcI9KE7QNzNMoRCPEU4kZU7KJ9SVE7ng9gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669847477; a=rsa-sha256; cv=none; b=SshoVc+B+KvmX7DOQIsSYEmxsIFATPp6OnMK7WMUzbFT7CC31Xerb6S2qe9kjEfxYSRxm2 MT61ycGKywSuiPYLT0VoY/EULgYoRKaX6y201C6sFKdeWPaiW9E8x9NnF3gcHRIX2youNv hFLLpG1wDh3YdCf6/0dGmWa/yjzXOZEsee9pBf3tmDQdTn6fxf9POG6/PfGfUYwoJdL3NV //C4/OFnkD6TplnPW4zzwgKXTAsrqRjuAwUyfrsLZ2eyFRL52MbarYxpBkysTNY/bIOVID yD/dyL5zYzygX/C7d/wQhmzzhEfv/qfYOpEeko+NwmYJSMKrZ334/vZS7DgC8Q== 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 4NMv7T0dV9zDgl; Wed, 30 Nov 2022 22:31:17 +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 2AUMVGN6023404; Wed, 30 Nov 2022 22:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUMVGXF023403; Wed, 30 Nov 2022 22:31:16 GMT (envelope-from git) Date: Wed, 30 Nov 2022 22:31:16 GMT Message-Id: <202211302231.2AUMVGXF023403@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: 77378d79f165 - main - stand/efi: Move to using common devparse() 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 77378d79f165b59296a0133eb910af55c8b2b600 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=77378d79f165b59296a0133eb910af55c8b2b600 commit 77378d79f165b59296a0133eb910af55c8b2b600 Author: Warner Losh AuthorDate: 2022-11-30 22:08:55 +0000 Commit: Warner Losh CommitDate: 2022-11-30 22:30:32 +0000 stand/efi: Move to using common devparse() We no longer need to have to hand-code this for each boot loader since devparse() handles them all with dv_parsedev(). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D37340 --- stand/efi/libefi/devicename.c | 105 ++---------------------------------------- 1 file changed, 3 insertions(+), 102 deletions(-) diff --git a/stand/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c index 73b1d783c01f..83f4e6e99201 100644 --- a/stand/efi/libefi/devicename.c +++ b/stand/efi/libefi/devicename.c @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include -static int efi_parsedev(struct devdesc **, const char *, const char **); - /* * Point (dev) at an allocated device specifier for the device matching the * path in (devspec). If it contains an explicit device specification, @@ -57,110 +55,13 @@ efi_getdev(void **vdev, const char *devspec, const char **path) * use the current device instead. */ if (devspec == NULL || *devspec == '/' || !strchr(devspec, ':')) { - rv = efi_parsedev(dev, getenv("currdev"), NULL); + rv = devparse(dev, getenv("currdev"), NULL); if (rv == 0 && path != NULL) *path = devspec; return (rv); } - /* Parse the device name off the beginning of the devspec. */ - return (efi_parsedev(dev, devspec, path)); -} - -/* - * Point (dev) at an allocated device specifier matching the string version - * at the beginning of (devspec). Return a pointer to the remaining - * text in (path). - * - * In all cases, the beginning of (devspec) is compared to the names - * of known devices in the device switch, and then any following text - * is parsed according to the rules applied to the device type. - * - * For disk-type devices, the syntax is: - * - * fs: - */ -static int -efi_parsedev(struct devdesc **dev, const char *devspec, const char **path) -{ - struct devdesc *idev; - struct devsw *dv; - int i, unit, err; - char *cp; - const char *np; - - /* minimum length check */ - if (strlen(devspec) < 2) - return (EINVAL); - - /* look for a device that matches */ - for (i = 0; devsw[i] != NULL; i++) { - dv = devsw[i]; - if (!strncmp(devspec, dv->dv_name, strlen(dv->dv_name))) - break; - } - if (devsw[i] == NULL) - return (ENOENT); - - np = devspec + strlen(dv->dv_name); - idev = NULL; - err = 0; - - switch (dv->dv_type) { - case DEVT_NONE: - break; - - case DEVT_DISK: - err = disk_parsedev(&idev, np, path); - if (err != 0) - goto fail; - break; - -#ifdef EFI_ZFS_BOOT - case DEVT_ZFS: - err = zfs_parsedev(&idev, np, path); - if (err != 0) - goto fail; - break; -#endif - default: - idev = malloc(sizeof(struct devdesc)); - if (idev == NULL) - return (ENOMEM); - - unit = 0; - cp = (char *)np; - - if (*np != '\0' && *np != ':') { - errno = 0; - unit = strtol(np, &cp, 0); - if (errno != 0 || cp == np) { - err = EUNIT; - goto fail; - } - } - if (*cp != '\0' && *cp != ':') { - err = EINVAL; - goto fail; - } - - idev->d_unit = unit; - if (path != NULL) - *path = (*cp == 0) ? cp : cp + 1; - break; - } - - idev->d_dev = dv; - - if (dev != NULL) - *dev = idev; - else - free(idev); - return (0); - -fail: - free(idev); - return (err); + return (devparse(dev, devspec, path)); } /* @@ -172,7 +73,7 @@ efi_setcurrdev(struct env_var *ev, int flags, const void *value) struct devdesc *ncurr; int rv; - rv = efi_parsedev(&ncurr, value, NULL); + rv = devparse(&ncurr, value, NULL); if (rv != 0) return (rv); free(ncurr);