From nobody Tue Jan 24 22:12:06 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 4P1h5y6pRvz3bfnt; Tue, 24 Jan 2023 22:12:06 +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 4P1h5y598Nz4QcS; Tue, 24 Jan 2023 22:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598326; 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=X8QRskpaggKN0KSF25BB5XiL5ONFMwj1Kon9pIJJlAU=; b=wpTMmJerR9WoKcetQ/pVTbzNqU/1bncg5od2LVoBMuUEvHknvEOdBtZSqeGRv6VpsQ20C7 sjrlwDdGd1Dvu2QDLS6ho2FcgQWZneTH4iOxYP3ql52lqHkMpOSOa+cujeUjBQtv8miHUI dXdBHVBd/BxUdl5gmPChn20JxP3MqqjNlqgFiuqbA0C8DPVy3lacm/ZUZO1bdPOt2espOp XjPE0cM3q50oAzcCjk080rLhG0DRawScfqtlyxsBPuYXmNBuL+S26PBl/dLJDobk2+yroX OftjAuc1lqjQLWkub2m/zrbkGQgQEHrdBBuiBg+sENH+n3w0aUtmgQ8Rv3p3Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598326; 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=X8QRskpaggKN0KSF25BB5XiL5ONFMwj1Kon9pIJJlAU=; b=OayXyH9Ku3ky6zv/9fn9/E7ClE1y4QNfhzefxPD8p+Q+1UPwLmilNNAfgy8FeKLyxggdr3 nRwDvUnSZ7MR1IsQKO6/riV2ubTQ8ywFakbhRhH9FCEmsOueDblv6k8HhzqCb4M0KMsP+c JGwx1klUGGspGwiiTpjEZJ/ftkFfbKfjqFX/jgIssLPhPwszbCYpVJIU1d9v8YXNQbfXxg ErpOdvtByYB/YcicHqbkUz7Z57ciZAW+8swRd7wVDR00dQaEkQvapDGwSqpDE+MsI/HpL5 QsTplpmzuHaTCRhmT3rShEvlhrkwU6Y7TT+ekdlkkjd9uEF5a2KdIvjA+n3mrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598326; a=rsa-sha256; cv=none; b=GFf4NouEaICVeGzatJ6FChmZYMkaPrtjys6dgrNdHn4RsqIDpMUqj+or2MOgmo/ArAfsnq eCVWM4VZR444ROJ9duP6FI7sug/fe+3by6qz8GNn0cOINkcMKzzGmyNdtAhfPgwfJcOYoX kkHYjlBeG1Fw3uDYawde8TlAsAveKckrRmWWTqJh6/uBKy01100GdLOLveseadj2o4lCuI ySm/dgLxyZa/jgGoVgXI/ngPA7B1UnPixSWmboT/MmPK31tnVW2yu+wnvId+BOUUWXzkHt EV9NsrYJw60ha8aPSaIMGIS7O19dG6u39fmTGFekQSiDjfYc+V/b08pRo1T0Tg== 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 4P1h5y46WPzQgD; Tue, 24 Jan 2023 22:12:06 +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 30OMC6E7086568; Tue, 24 Jan 2023 22:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMC6X3086567; Tue, 24 Jan 2023 22:12:06 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:06 GMT Message-Id: <202301242212.30OMC6X3086567@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: 1c68ec6c69b5 - stable/13 - stand: i386_fmtdev can be reduced to devformat 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: 1c68ec6c69b5e111fe8e197a3c65bc5beca88318 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c68ec6c69b5e111fe8e197a3c65bc5beca88318 commit 1c68ec6c69b5e111fe8e197a3c65bc5beca88318 Author: Warner Losh AuthorDate: 2022-08-11 15:09:03 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:31 +0000 stand: i386_fmtdev can be reduced to devformat devformat produces the same output as i386_fmtdev, so just use it to reduce on the dependencies. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D35927 (cherry picked from commit 362322294045943703e03dee263bbc237002525c) --- stand/i386/libi386/bootinfo32.c | 4 ++-- stand/i386/libi386/bootinfo64.c | 2 +- stand/i386/libi386/devicename.c | 27 --------------------------- stand/i386/loader/main.c | 4 ++-- 4 files changed, 5 insertions(+), 32 deletions(-) diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index 23b02693cf48..7afb11c6a3b7 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -167,7 +167,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t } /* Try reading the /etc/fstab file to select the root device */ - getrootmount(i386_fmtdev((void *)rootdev)); + getrootmount(devformat(&rootdev->dd)); /* Do legacy rootdev guessing */ @@ -191,7 +191,7 @@ bi_load32(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t rootdev->dd.d_dev->dv_type); } if (bootdevnr == -1) { - printf("root device %s invalid\n", i386_fmtdev(rootdev)); + printf("root device %s invalid\n", devformat(&rootdev->dd)); return (EINVAL); } free(rootdev); diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c index 1ffa4188d926..e1dc704e0e1c 100644 --- a/stand/i386/libi386/bootinfo64.c +++ b/stand/i386/libi386/bootinfo64.c @@ -216,7 +216,7 @@ bi_load64(char *args, vm_offset_t *modulep, } /* Try reading the /etc/fstab file to select the root device */ - getrootmount(i386_fmtdev((void *)rootdev)); + getrootmount(devformat(&rootdev->dd)); addr = 0; /* find the last module in the chain */ diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c index 061f2ba9ce9f..73445aeba172 100644 --- a/stand/i386/libi386/devicename.c +++ b/stand/i386/libi386/devicename.c @@ -171,33 +171,6 @@ i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path) return(err); } - -char * -i386_fmtdev(void *vdev) -{ - struct i386_devdesc *dev = (struct i386_devdesc *)vdev; - static char buf[128]; /* XXX device length constant? */ - - switch(dev->dd.d_dev->dv_type) { - case DEVT_NONE: - strcpy(buf, "(no device)"); - break; - - case DEVT_CD: - case DEVT_NET: - sprintf(buf, "%s%d:", dev->dd.d_dev->dv_name, dev->dd.d_unit); - break; - - case DEVT_DISK: - return (disk_fmtdev(vdev)); - - case DEVT_ZFS: - return(zfs_fmtdev(vdev)); - } - return(buf); -} - - /* * Set currdev to suit the value being supplied in (value) */ diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index c15c97c961b7..15d1c312b278 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -390,9 +390,9 @@ extract_currdev(void) init_zfs_boot_options(devformat(&new_currdev.dd)); #endif - env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev), + env_setenv("currdev", EV_VOLATILE, devformat(&new_currdev.dd), i386_setcurrdev, env_nounset); - env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&new_currdev), + env_setenv("loaddev", EV_VOLATILE, devformat(&new_currdev.dd), env_noset, env_nounset); }