d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand: efi_fmtdev can be reduced to devformat

Browse Source 
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
This commit is contained in:
Warner Losh 2022-08-11 09:08:08 -06:00
parent edb26097cb
commit 1e7a2eb93a
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stand/efi/include/efilib.h
View File

@ -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);

26
stand/efi/libefi/devicename.c
View File

@ -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)
*/

2
stand/efi/loader/bootinfo.c
View File

@ -478,7 +478,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) {

4
stand/efi/loader/main.c
View File

@ -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();