From nobody Tue Jan 24 22:13:16 2023 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 4P1h7J6FChz3bgP2; Tue, 24 Jan 2023 22:13:16 +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 4P1h7J5fLrz3GGT; Tue, 24 Jan 2023 22:13:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598396; 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=/XY+S3nmmhbu8+mY3py50Y/G9ihjdQU7pgmuWYZvPNQ=; b=Wg0Q5sViUIenmC9zV3JBjvJ+ax3JbA4b99lVYk+KVMVZz8x88YQqHQkKuqNLPxBt5WLaBb tMEdrR7SqYdHEJqULTfTqXWjAdD9vc3uvrBQkZYcBUKxOs261P7trO0by3pnFm26f4E/c5 FU2VnOyCM68kol4zRyF5kSDkjpW4CWEd05LJUnQlTZzI5EhqCmNC6hDJUJnG5vhJve6oa6 mBRJ3lZjClNo150TAC2hlWmoy2hgQf+mExbPM6EY1SKLh4+gc4JxB7t2C77IGKGjlY8lTs UA/2M3y+0npSJM0Hr85rzPJrndVo/04PrI9V11nPEx1748pae4lV9vrsReXlcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598396; 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=/XY+S3nmmhbu8+mY3py50Y/G9ihjdQU7pgmuWYZvPNQ=; b=rbfkRw69yJuDyxhPhS1rYBfxrahQHN3v76FCh2Xh53UD2B3QcKUDqJOQqv+MpfZIBrVRJ2 26MYBmFgQ3mKjcoTaStuZoDJpMVYdZaXz24hmfjV/WZHnjJj+e6hJ3QycVLc5b/l5JblY+ 2OMP8lNnzTdxdLl7NSrB8XFCkV+vTpRhrdp6vCBJRuZD2a+5J/SWGanUdXbYi2ktkGtUXR KOxh4gRoBrEV4EjUw0dj7TJ+Ea9WN9fE/E/F8twAMfbkP9DqkYxdDT3QOx5KP1r4nhQ9mV 1X6+0URHp1t4W8Dnv5twDp7rx6czBqWbSFuxzxV3fUIASv8sdbd7PS9/0Loapw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598396; a=rsa-sha256; cv=none; b=yECKhCZbLz+gWeZrkc15oaZZG6IcCo7WA8QncSYPVhzqMflR+DWF248XxnP4kYqDR8eauE j1ZRBGIbESHTTa8dZf7Ss7sFoebiItfFpZKCVr9ZNZy+iD/pYhVB25p/yT6Pn5Jtr4uy8M U5OHjt2ozaR1YZKDNoCiRSS6AvWTlLzLHqpvf6F1p9gijQazQeR/Dd+gKqO3zDq33voiSd 1F802afMu8lR/tAvlo5c6CH8AxQUMusCLn80C/FDjCO8opm3L4ijCgTmReIcEZUoK+3WvC zLtGsOUvuDO22lpduXZoY3O8GWj9CkkZsjfDIewLndeXzPet4Ftmo3/62rUdWg== 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 4P1h7J4cyczQYf; Tue, 24 Jan 2023 22:13:16 +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 30OMDGC8088198; Tue, 24 Jan 2023 22:13:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMDGLM088197; Tue, 24 Jan 2023 22:13:16 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:13:16 GMT Message-Id: <202301242213.30OMDGLM088197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0bd2b461b9f6 - stable/13 - stand/i386: Move to using common devparse() 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0bd2b461b9f6f515b67ec28f33cf51d9d8dd4c3d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bd2b461b9f6f515b67ec28f33cf51d9d8dd4c3d commit 0bd2b461b9f6f515b67ec28f33cf51d9d8dd4c3d Author: Warner Losh AuthorDate: 2022-11-30 22:09:00 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:39 +0000 stand/i386: 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/D37341 (cherry picked from commit 641a0617e8d060c3c5fb997cee9e2b7fb40d9306) --- stand/i386/libi386/devicename.c | 109 ++-------------------------------------- 1 file changed, 5 insertions(+), 104 deletions(-) diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c index 1d7e4c7d3fa3..99d3aa7920bc 100644 --- a/stand/i386/libi386/devicename.c +++ b/stand/i386/libi386/devicename.c @@ -32,9 +32,6 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "disk.h" #include "libi386.h" -#include "libzfs.h" - -static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path); /* * Point (dev) at an allocated device specifier for the device matching the @@ -44,7 +41,7 @@ static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const c int i386_getdev(void **vdev, const char *devspec, const char **path) { - struct i386_devdesc **dev = (struct i386_devdesc **)vdev; + struct devdesc **dev = (struct devdesc **)vdev; int rv; /* @@ -55,7 +52,7 @@ i386_getdev(void **vdev, const char *devspec, const char **path) (devspec[0] == '/') || (strchr(devspec, ':') == NULL)) { - if (((rv = i386_parsedev(dev, getenv("currdev"), NULL)) == 0) && + if (((rv = devparse(dev, getenv("currdev"), NULL)) == 0) && (path != NULL)) *path = devspec; return(rv); @@ -64,103 +61,7 @@ i386_getdev(void **vdev, const char *devspec, const char **path) /* * Try to parse the device name off the beginning of the devspec */ - return(i386_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: - * - * disk[s][]: - * - */ -static int -i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path) -{ - struct i386_devdesc *idev = NULL; - 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, dv = NULL; devsw[i] != NULL; i++) { - if (!strncmp(devspec, devsw[i]->dv_name, strlen(devsw[i]->dv_name))) { - dv = devsw[i]; - break; - } - } - if (dv == 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((struct devdesc **)&idev, np, path); - if (err != 0) - goto fail; - break; - - case DEVT_ZFS: - err = zfs_parsedev((struct devdesc **)&idev, np, path); - if (err != 0) - goto fail; - break; - - default: - idev = malloc(sizeof (struct devdesc)); - if (idev == NULL) - return (ENOMEM); - - unit = 0; - cp = (char *)np; - - if (*np && (*np != ':')) { - unit = strtol(np, &cp, 0); /* get unit number if present */ - if (cp == np) { - err = EUNIT; - goto fail; - } - } - - if (*cp && (*cp != ':')) { - err = EINVAL; - goto fail; - } - - idev->dd.d_unit = unit; - if (path != NULL) - *path = (*cp == 0) ? cp : cp + 1; - break; - } - idev->dd.d_dev = dv; - if (dev != NULL) - *dev = idev; - else - free(idev); - - return(0); - - fail: - free(idev); - return(err); + return(devparse(dev, devspec, path)); } /* @@ -169,10 +70,10 @@ i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path) int i386_setcurrdev(struct env_var *ev, int flags, const void *value) { - struct i386_devdesc *ncurr; + struct devdesc *ncurr; int rv; - if ((rv = i386_parsedev(&ncurr, value, NULL)) != 0) + if ((rv = devparse(&ncurr, value, NULL)) != 0) return (rv); free(ncurr);