From nobody Tue Jan 24 22:12:03 2023 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 4P1h5v4n2Bz3bfjJ; Tue, 24 Jan 2023 22:12:03 +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 4P1h5v35rSz4QFC; Tue, 24 Jan 2023 22:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598323; 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=NvRYN5y6WIh8U1r4r8xoqSGRkmZvCkRHUnSCcONFl94=; b=ovc52o9uonXHqYmEox3iGfcqTH0Lxs+DBvHB/2KSWeVIis8fXRI5KMoZuRH4p3SEnTeiM5 9IovlcSdGC03WvrfKXgDj1XX4uZbp2n0NYVwdLZIrJEyQ6SC2FXr28Hyw67Yil4wJfChZw SPJd1QM1C/r0nmxEUUDNYe0WFDsjs29VaFoR7MeBkyQA4tg37oB4uBXw7C2coTZXJzxg43 zxraTwfABhNhmVq3ilKqWPQl0tap4vfA93piz2aI1k7Tg837Kj0c95+vJ7Em2PKCEYTnUz 4PhPeDpHIKCXfbbQHOhSxnIdR9iuV3LjWbSpBKujdtCbVda8uszuw6rpg/mzuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598323; 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=NvRYN5y6WIh8U1r4r8xoqSGRkmZvCkRHUnSCcONFl94=; b=K3nBKuACJqeB9AuIyuOFJQ28cNJfTDMHCHltbvQZTgKAKR6D8Ivqjzxcj0+YPf9dSUjN2x IoVwYJ8V8DE7lCuKS3E8txfFF/c7VpLHCIU/xKgrchX5eHnfE7J3jdfqWKkO9llz25bRLT Jgf8+JeVdzMlMx0IJdvb0/h8ip5oFdCtlEjsqKi/5q6Q+XxQv730xrMFhrzOcPOaBoP7sy 2ZIMt0iIOKKzFIDDK1A8NOL7T5BMsCf3zDDhhKe3CePQP2THCr2zhyXkgtESw8GmAZUyT8 0gJe6SYe+N0fbHqkIW8e9nP4Ftb8kJ0h60hqho5Bb6oLMkVTydRZqU1ZNizrGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598323; a=rsa-sha256; cv=none; b=iPX8Uqa5sxqNJDnpVNs7s2QVRAZCGn4Lg4QzA0Sxh83Dh3jIJ0RfOArzEZVs0oClLLGNM7 q8yLvRyD7q3C7jRq64ujSsM+SKZmBVeETWasUy3X61mq/gZ4aE0zgtEeriEX1MYYgRGTK3 FK4QSKK5eQDLtlD5hrGC8+L5rK4D+NGYU/IgsPHqIZaswDP2vTsbf9Zf87SlYnsTeL2h5Y jMEtIHAH4d9VgNydoJM8IdEFdh9UG08m7oyd55WrV4KOzAFNsAA5JAZf5QDdOeqNwMVUcm z/or9ZLr0tqOHiB+4TWCkaa217UwF+wHcK8thZKnA/Tcnn2DUXXH64LhBm24Uw== 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 4P1h5v1wklzQXn; Tue, 24 Jan 2023 22:12:03 +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 30OMC38B085555; Tue, 24 Jan 2023 22:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC3tK085554; Tue, 24 Jan 2023 22:12:03 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:03 GMT Message-Id: <202301242212.30OMC3tK085554@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: 75b7d39e116f - stable/13 - stand: efi_fmtdev can be reduced to devformat 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 75b7d39e116f79563ea3d8d18f9bf3141f89a712 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=75b7d39e116f79563ea3d8d18f9bf3141f89a712 commit 75b7d39e116f79563ea3d8d18f9bf3141f89a712 Author: Warner Losh AuthorDate: 2022-08-11 15:08:08 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +0000 stand: efi_fmtdev can be reduced to devformat devformat produces the same output as efi_fmtdev, so just use it to reduce on the dependencies. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D35924 (cherry picked from commit 1e7a2eb93a527a2f4b22be66788caf50e4ba1f89) --- stand/efi/include/efilib.h | 1 - stand/efi/libefi/devicename.c | 26 -------------------------- stand/efi/loader/bootinfo.c | 2 +- stand/efi/loader/main.c | 4 ++-- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h index 903e1f0d00e5..bbef44fca4b3 100644 --- a/stand/efi/include/efilib.h +++ b/stand/efi/include/efilib.h @@ -85,7 +85,6 @@ efi_exit_boot_services(UINTN key) } int efi_getdev(void **vdev, const char *devspec, const char **path); -char *efi_fmtdev(void *vdev); int efi_setcurrdev(struct env_var *ev, int flags, const void *value); diff --git a/stand/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c index cdf4830697fd..67a2e24d9da1 100644 --- a/stand/efi/libefi/devicename.c +++ b/stand/efi/libefi/devicename.c @@ -171,32 +171,6 @@ fail: return (err); } -char * -efi_fmtdev(void *vdev) -{ - struct devdesc *dev = (struct devdesc *)vdev; - static char buf[SPECNAMELEN + 1]; - - switch(dev->d_dev->dv_type) { - case DEVT_NONE: - strcpy(buf, "(no device)"); - break; - - case DEVT_DISK: - return (disk_fmtdev(vdev)); - -#ifdef EFI_ZFS_BOOT - case DEVT_ZFS: - return (zfs_fmtdev(dev)); -#endif - default: - sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit); - break; - } - - return (buf); -} - /* * Set currdev to suit the value being supplied in (value) */ diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index da9577803b12..7f1a2f840f78 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -480,7 +480,7 @@ bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, bool exit_bs) } /* Try reading the /etc/fstab file to select the root device */ - getrootmount(efi_fmtdev((void *)rootdev)); + getrootmount(devformat(rootdev)); addr = 0; for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 0a5a03765ddc..7e6c1397781a 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -203,7 +203,7 @@ set_currdev_devdesc(struct devdesc *currdev) { const char *devname; - devname = efi_fmtdev(currdev); + devname = devformat(currdev); printf("Setting currdev to %s\n", devname); set_currdev(devname); } @@ -273,7 +273,7 @@ probe_zfs_currdev(uint64_t guid) currdev.pool_guid = guid; currdev.root_guid = 0; set_currdev_devdesc((struct devdesc *)&currdev); - devname = efi_fmtdev(&currdev); + devname = devformat(&currdev.dd); init_zfs_boot_options(devname); rv = sanity_check_currdev();