[Midnightbsd-cvs] src [8635] trunk/sys/dev/md/md.c: print correct unit number when attaching preloaded memory disks.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Sep 25 14:14:31 EDT 2016


Revision: 8635
          http://svnweb.midnightbsd.org/src/?rev=8635
Author:   laffer1
Date:     2016-09-25 14:14:31 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
print correct unit number when attaching preloaded memory disks.

Modified Paths:
--------------
    trunk/sys/dev/md/md.c

Modified: trunk/sys/dev/md/md.c
===================================================================
--- trunk/sys/dev/md/md.c	2016-09-25 18:12:51 UTC (rev 8634)
+++ trunk/sys/dev/md/md.c	2016-09-25 18:14:31 UTC (rev 8635)
@@ -131,7 +131,6 @@
 static void g_md_dumpconf(struct sbuf *sb, const char *indent,
     struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp);
 
-static int mdunits;
 static struct cdev *status_dev = 0;
 static struct sx md_sx;
 static struct unrhdr *md_uh;
@@ -1243,7 +1242,7 @@
 }
 
 static void
-md_preloaded(u_char *image, size_t length)
+md_preloaded(u_char *image, size_t length, const char *name)
 {
 	struct md_s *sc;
 	int error;
@@ -1261,6 +1260,10 @@
 		rootdevnames[0] = "ufs:/dev/md0";
 #endif
 	mdinit(sc);
+	if (name != NULL) {
+		printf("%s%d: Preloaded image <%s> %zd bytes at %p\n",
+		    MD_NAME, sc->unit, name, length, image);
+	}
 }
 
 static void
@@ -1281,7 +1284,7 @@
 	md_uh = new_unrhdr(0, INT_MAX, NULL);
 #ifdef MD_ROOT_SIZE
 	sx_xlock(&md_sx);
-	md_preloaded(mfs_root.start, sizeof(mfs_root.start));
+	md_preloaded(mfs_root.start, sizeof(mfs_root.start), NULL);
 	sx_xunlock(&md_sx);
 #endif
 	/* XXX: are preload_* static or do they need Giant ? */
@@ -1297,10 +1300,8 @@
 		ptr = preload_fetch_addr(mod);
 		len = preload_fetch_size(mod);
 		if (ptr != NULL && len != 0) {
-			printf("%s%d: Preloaded image <%s> %d bytes at %p\n",
-			    MD_NAME, mdunits, name, len, ptr);
 			sx_xlock(&md_sx);
-			md_preloaded(ptr, len);
+			md_preloaded(ptr, len, name);
 			sx_xunlock(&md_sx);
 		}
 	}



More information about the Midnightbsd-cvs mailing list