Page MenuHomeFreeBSD
Files F177301713

D59262.1794111762.diff
No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D59262.1794111762.diff
View Options

diff --git a/stand/userboot/userboot/libuserboot.h b/stand/userboot/userboot/libuserboot.h
--- a/stand/userboot/userboot/libuserboot.h
+++ b/stand/userboot/userboot/libuserboot.h
@@ -39,6 +39,7 @@
/* exported devices */
extern struct devsw userboot_disk;
extern int userboot_disk_maxunit;
+int userboot_disk_firstunit(void);
extern struct devsw host_dev;
/* access to host filesystem */
diff --git a/stand/userboot/userboot/main.c b/stand/userboot/userboot/main.c
--- a/stand/userboot/userboot/main.c
+++ b/stand/userboot/userboot/main.c
@@ -237,9 +237,13 @@
{
struct disk_devdesc dev;
struct devdesc *dd;
+ int diskunit;
#if defined(USERBOOT_ZFS_SUPPORT)
struct zfs_devdesc zdev;
+#endif
+ diskunit = userboot_disk_firstunit();
+#if defined(USERBOOT_ZFS_SUPPORT)
if (userboot_zfs_found) {
/* Leave the pool/root guid's unassigned */
@@ -250,10 +254,9 @@
dd = &zdev.dd;
} else
#endif
-
- if (userboot_disk_maxunit > 0) {
+ if (diskunit >= 0) {
dev.dd.d_dev = &userboot_disk;
- dev.dd.d_unit = 0;
+ dev.dd.d_unit = diskunit;
dev.d_slice = D_SLICEWILD;
dev.d_partition = D_PARTWILD;
/*
diff --git a/stand/userboot/userboot/userboot_disk.c b/stand/userboot/userboot/userboot_disk.c
--- a/stand/userboot/userboot/userboot_disk.c
+++ b/stand/userboot/userboot/userboot_disk.c
@@ -82,25 +82,29 @@
off_t mediasize;
u_int sectorsize;
int i;
+ int userdisk_usable = 0;
userdisk_maxunit = userboot_disk_maxunit;
if (userdisk_maxunit > 0) {
- ud_info = malloc(sizeof(*ud_info) * userdisk_maxunit);
- if (ud_info == NULL)
+ ud_info = calloc(userdisk_maxunit, sizeof(*ud_info));
+ if (ud_info == NULL) {
+ userdisk_maxunit = 0;
+ userboot_disk_maxunit = 0;
return (ENOMEM);
+ }
for (i = 0; i < userdisk_maxunit; i++) {
if (CALLBACK(diskioctl, i, DIOCGSECTORSIZE,
- &sectorsize) != 0 || CALLBACK(diskioctl, i,
- DIOCGMEDIASIZE, &mediasize) != 0)
- return (ENXIO);
- ud_info[i].mediasize = mediasize;
- ud_info[i].sectorsize = sectorsize;
- ud_info[i].ud_open = 0;
- ud_info[i].ud_bcache = NULL;
+ &sectorsize) == 0 && CALLBACK(diskioctl, i,
+ DIOCGMEDIASIZE, &mediasize) == 0 && mediasize > 0) {
+ ud_info[i].mediasize = mediasize;
+ ud_info[i].sectorsize = sectorsize;
+ userdisk_usable++;
+ }
}
}
- bcache_add_dev(userdisk_maxunit);
- return(0);
+ bcache_add_dev(userdisk_usable);
+
+ return (0);
}
static void
@@ -111,6 +115,18 @@
free(ud_info);
}
+int
+userboot_disk_firstunit(void)
+{
+ int i;
+
+ for (i = 0; i < userdisk_maxunit; i++) {
+ if (ud_info[i].mediasize != 0)
+ return (i);
+ }
+ return (-1);
+}
+
/*
* Print information about disks
*/
@@ -121,7 +137,7 @@
char line[80];
int i, ret = 0;
- if (userdisk_maxunit == 0)
+ if (userboot_disk_firstunit() < 0)
return (0);
printf("%s devices:", userboot_disk.dv_name);
@@ -129,6 +145,8 @@
return (ret);
for (i = 0; i < userdisk_maxunit; i++) {
+ if (ud_info[i].mediasize == 0)
+ continue;
snprintf(line, sizeof(line),
" disk%d: Guest drive image\n", i);
ret = pager_output(line);
@@ -163,7 +181,8 @@
dev = va_arg(ap, struct disk_devdesc *);
va_end(ap);
- if (dev->dd.d_unit < 0 || dev->dd.d_unit >= userdisk_maxunit)
+ if (dev->dd.d_unit < 0 || dev->dd.d_unit >= userdisk_maxunit ||
+ ud_info[dev->dd.d_unit].mediasize == 0)
return (EIO);
ud_info[dev->dd.d_unit].ud_open++;
if (ud_info[dev->dd.d_unit].ud_bcache == NULL)

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 8, 4:22 AM (4 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41567346
Default Alt Text
D59262.1794111762.diff (3 KB)

Event Timeline