diff --git a/tools/regression/geom/Test/T000/ref.conf b/tools/regression/geom/Test/T000/ref.conf
index a375ddfdd23e..069c69832543 100644
--- a/tools/regression/geom/Test/T000/ref.conf
+++ b/tools/regression/geom/Test/T000/ref.conf
@@ -1,23 +1,23 @@
$FreeBSD$
-
+
[0x805ba60]
- DEV-method
-
-
+ DEV-class
+
+
[0x805b9a0]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x805ba40]
- MBR-method
-
-
+ MBR-class
+
+
[0x805ba80]
- BSD-method
-
-
+ BSD-class
+
+
[0x805b980]
- SIMDISK-method
-
+ SIMDISK-class
+
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 80a643e871d1..a0f445069c06 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071cc0]
- DEV-method
+ DEV-class
[0x80c1580]
- [0x8071cc0]
+ [0x8071cc0]
ad0s3d
4
@@ -17,7 +17,7 @@
[0x80c1480]
- [0x8071cc0]
+ [0x8071cc0]
ad0s3c
4
@@ -29,7 +29,7 @@
[0x80c1380]
- [0x8071cc0]
+ [0x8071cc0]
ad0s3a
4
@@ -41,7 +41,7 @@
[0x80c1280]
- [0x8071cc0]
+ [0x8071cc0]
ad0s2c
4
@@ -53,7 +53,7 @@
[0x80c1180]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1f
4
@@ -65,7 +65,7 @@
[0x80c1080]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1e
4
@@ -77,7 +77,7 @@
[0x80bef80]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1c
4
@@ -89,7 +89,7 @@
[0x80bee80]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1b
4
@@ -101,7 +101,7 @@
[0x80bed80]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1a
4
@@ -113,7 +113,7 @@
[0x80bea00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s3
3
@@ -125,7 +125,7 @@
[0x80be780]
- [0x8071cc0]
+ [0x8071cc0]
ad0s2
3
@@ -137,7 +137,7 @@
[0x80be300]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1
3
@@ -149,7 +149,7 @@
[0x80ba080]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -159,17 +159,17 @@
r0w0e0
-
-
+
+
[0x8071c00]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ca0]
- MBR-method
+ MBR-class
[0x80ba0c0]
- [0x8071ca0]
+ [0x8071ca0]
ad0
2
@@ -225,13 +225,13 @@
-
-
+
+
[0x8071ce0]
- BSD-method
+ BSD-class
[0x80beb00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s3
3
@@ -286,7 +286,7 @@
[0x80be880]
- [0x8071ce0]
+ [0x8071ce0]
ad0s2
3
@@ -315,7 +315,7 @@
[0x80be400]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1
3
@@ -394,13 +394,13 @@
-
-
+
+
[0x8071be0]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071be0]
+ [0x8071be0]
ad0
1
@@ -410,5 +410,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index 19c52005c63e..f9b95c647a60 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071cc0]
- DEV-method
+ DEV-class
[0x80bb380]
- [0x8071cc0]
+ [0x8071cc0]
ad0s2
3
@@ -17,7 +17,7 @@
[0x80bb280]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1
3
@@ -29,7 +29,7 @@
[0x80ba080]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -39,17 +39,17 @@
r0w0e0
-
-
+
+
[0x8071c00]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ca0]
- MBR-method
+ MBR-class
[0x80ba0c0]
- [0x8071ca0]
+ [0x8071ca0]
ad0
2
@@ -91,17 +91,17 @@
-
-
+
+
[0x8071ce0]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071be0]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071be0]
+ [0x8071be0]
ad0
1
@@ -111,5 +111,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index fedaa698e495..2fd1f58ea060 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071cc0]
- DEV-method
+ DEV-class
[0x8124700]
- [0x8071cc0]
+ [0x8071cc0]
ad0s27
4
@@ -17,7 +17,7 @@
[0x8124600]
- [0x8071cc0]
+ [0x8071cc0]
ad0s26
4
@@ -29,7 +29,7 @@
[0x8124500]
- [0x8071cc0]
+ [0x8071cc0]
ad0s25
4
@@ -41,7 +41,7 @@
[0x8124400]
- [0x8071cc0]
+ [0x8071cc0]
ad0s24
4
@@ -53,7 +53,7 @@
[0x8124300]
- [0x8071cc0]
+ [0x8071cc0]
ad0s23
4
@@ -65,7 +65,7 @@
[0x8124200]
- [0x8071cc0]
+ [0x8071cc0]
ad0s22
4
@@ -77,7 +77,7 @@
[0x8124100]
- [0x8071cc0]
+ [0x8071cc0]
ad0s21
4
@@ -89,7 +89,7 @@
[0x8124000]
- [0x8071cc0]
+ [0x8071cc0]
ad0s20
4
@@ -101,7 +101,7 @@
[0x8101f00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s19
4
@@ -113,7 +113,7 @@
[0x8101e00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s18
4
@@ -125,7 +125,7 @@
[0x8101d00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s17
4
@@ -137,7 +137,7 @@
[0x8101c00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s16
4
@@ -149,7 +149,7 @@
[0x8101b00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s15
4
@@ -161,7 +161,7 @@
[0x8101a00]
- [0x8071cc0]
+ [0x8071cc0]
ad0s14
4
@@ -173,7 +173,7 @@
[0x8101900]
- [0x8071cc0]
+ [0x8071cc0]
ad0s13
4
@@ -185,7 +185,7 @@
[0x8101800]
- [0x8071cc0]
+ [0x8071cc0]
ad0s12
4
@@ -197,7 +197,7 @@
[0x8101700]
- [0x8071cc0]
+ [0x8071cc0]
ad0s11
4
@@ -209,7 +209,7 @@
[0x8101600]
- [0x8071cc0]
+ [0x8071cc0]
ad0s10
4
@@ -221,7 +221,7 @@
[0x8101500]
- [0x8071cc0]
+ [0x8071cc0]
ad0s9
4
@@ -233,7 +233,7 @@
[0x8101400]
- [0x8071cc0]
+ [0x8071cc0]
ad0s8
4
@@ -245,7 +245,7 @@
[0x8101300]
- [0x8071cc0]
+ [0x8071cc0]
ad0s7
4
@@ -257,7 +257,7 @@
[0x8101200]
- [0x8071cc0]
+ [0x8071cc0]
ad0s6
4
@@ -269,7 +269,7 @@
[0x8101100]
- [0x8071cc0]
+ [0x8071cc0]
ad0s5
4
@@ -281,7 +281,7 @@
[0x80cc380]
- [0x8071cc0]
+ [0x8071cc0]
ad0s2
3
@@ -293,7 +293,7 @@
[0x80cc280]
- [0x8071cc0]
+ [0x8071cc0]
ad0s1
3
@@ -305,7 +305,7 @@
[0x80ba080]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -315,13 +315,13 @@
r0w0e0
-
-
+
+
[0x8071c00]
- MBREXT-method
+ MBREXT-class
[0x80cc480]
- [0x8071c00]
+ [0x8071c00]
ad0s2
3
@@ -657,13 +657,13 @@
-
-
+
+
[0x8071ca0]
- MBR-method
+ MBR-class
[0x80ba0c0]
- [0x8071ca0]
+ [0x8071ca0]
ad0
2
@@ -705,17 +705,17 @@
-
-
+
+
[0x8071ce0]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071be0]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071be0]
+ [0x8071be0]
ad0
1
@@ -725,5 +725,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 03e296ef8b5d..20b111a0ab09 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071ce0]
- DEV-method
+ DEV-class
[0x80bef00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1h
4
@@ -17,7 +17,7 @@
[0x80bee00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1g
4
@@ -29,7 +29,7 @@
[0x80bed00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1f
4
@@ -41,7 +41,7 @@
[0x80bec00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1e
4
@@ -53,7 +53,7 @@
[0x80beb00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1d
4
@@ -65,7 +65,7 @@
[0x80bea00]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1c
4
@@ -77,7 +77,7 @@
[0x80be900]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1b
4
@@ -89,7 +89,7 @@
[0x80be800]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1a
4
@@ -101,7 +101,7 @@
[0x80be200]
- [0x8071ce0]
+ [0x8071ce0]
ad0s1
3
@@ -113,7 +113,7 @@
[0x80ba080]
- [0x8071ce0]
+ [0x8071ce0]
ad0
2
@@ -123,17 +123,17 @@
r0w0e0
-
-
+
+
[0x8071c20]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071cc0]
- MBR-method
+ MBR-class
[0x80ba0c0]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -161,13 +161,13 @@
-
-
+
+
[0x8071d00]
- BSD-method
+ BSD-class
[0x80be300]
- [0x8071d00]
+ [0x8071d00]
ad0s1
3
@@ -285,13 +285,13 @@
-
-
+
+
[0x8071c00]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071c00]
+ [0x8071c00]
ad0
1
@@ -301,5 +301,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 9c56e70d588c..aa3055c84bec 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071cc0]
- DEV-method
+ DEV-class
[0x80bb500]
- [0x8071cc0]
+ [0x8071cc0]
ad0c
3
@@ -17,7 +17,7 @@
[0x80bb400]
- [0x8071cc0]
+ [0x8071cc0]
ad0b
3
@@ -29,7 +29,7 @@
[0x80bb300]
- [0x8071cc0]
+ [0x8071cc0]
ad0a
3
@@ -41,7 +41,7 @@
[0x80ba080]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -51,21 +51,21 @@
r0w0e0
-
-
+
+
[0x8071c00]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ca0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071ce0]
- BSD-method
+ BSD-class
[0x80ba0c0]
- [0x8071ce0]
+ [0x8071ce0]
ad0
2
@@ -118,13 +118,13 @@
-
-
+
+
[0x8071be0]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071be0]
+ [0x8071be0]
ad0
1
@@ -134,5 +134,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T006/ref.conf b/tools/regression/geom/Test/T006/ref.conf
index 63fc0495271b..b49ddd3add41 100644
--- a/tools/regression/geom/Test/T006/ref.conf
+++ b/tools/regression/geom/Test/T006/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071cc0]
- DEV-method
+ DEV-class
[0x80ba080]
- [0x8071cc0]
+ [0x8071cc0]
ad0
2
@@ -15,25 +15,25 @@
r0w0e0
-
-
+
+
[0x8071c00]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ca0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071ce0]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071be0]
- SIMDISK-method
+ SIMDISK-class
[0x80ba040]
- [0x8071be0]
+ [0x8071be0]
ad0
1
@@ -43,5 +43,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T007/ref.conf b/tools/regression/geom/Test/T007/ref.conf
index 69a88898e43d..a9abd7d7a177 100644
--- a/tools/regression/geom/Test/T007/ref.conf
+++ b/tools/regression/geom/Test/T007/ref.conf
@@ -1,23 +1,23 @@
$FreeBSD$
-
+
[0x8071d00]
- DEV-method
-
-
+ DEV-class
+
+
[0x8071c40]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ce0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071d20]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071c20]
- SIMDISK-method
-
+ SIMDISK-class
+
diff --git a/tools/regression/geom/Test/T008/ref.conf b/tools/regression/geom/Test/T008/ref.conf
index 69a88898e43d..a9abd7d7a177 100644
--- a/tools/regression/geom/Test/T008/ref.conf
+++ b/tools/regression/geom/Test/T008/ref.conf
@@ -1,23 +1,23 @@
$FreeBSD$
-
+
[0x8071d00]
- DEV-method
-
-
+ DEV-class
+
+
[0x8071c40]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071ce0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071d20]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071c20]
- SIMDISK-method
-
+ SIMDISK-class
+
diff --git a/tools/regression/geom/Test/T009/ref.conf b/tools/regression/geom/Test/T009/ref.conf
index 9215bf44ed97..9fbe0023891a 100644
--- a/tools/regression/geom/Test/T009/ref.conf
+++ b/tools/regression/geom/Test/T009/ref.conf
@@ -1,23 +1,23 @@
$FreeBSD$
-
+
[0x8071da0]
- DEV-method
-
-
+ DEV-class
+
+
[0x8071ce0]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071d80]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071dc0]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071cc0]
- SIMDISK-method
-
+ SIMDISK-class
+
diff --git a/tools/regression/geom/Test/T010/ref.conf b/tools/regression/geom/Test/T010/ref.conf
index 4c3726ee8098..ab26e7226e87 100644
--- a/tools/regression/geom/Test/T010/ref.conf
+++ b/tools/regression/geom/Test/T010/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x80725a0]
- DEV-method
+ DEV-class
[0x80ba200]
- [0x80725a0]
+ [0x80725a0]
ad0c
3
@@ -17,7 +17,7 @@
[0x80bb080]
- [0x80725a0]
+ [0x80725a0]
ad0
2
@@ -27,21 +27,21 @@
r1w0e0
-
-
+
+
[0x80724a0]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8072560]
- MBR-method
-
-
+ MBR-class
+
+
[0x80725e0]
- BSD-method
+ BSD-class
[0x80bb0c0]
- [0x80725e0]
+ [0x80725e0]
ad0
2
@@ -68,13 +68,13 @@
-
-
+
+
[0x8072460]
- SIMDISK-method
+ SIMDISK-class
[0x80bb040]
- [0x8072460]
+ [0x8072460]
ad0
1
@@ -84,5 +84,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T010/testprg.c b/tools/regression/geom/Test/T010/testprg.c
index 0154f5e699e0..63237b2f98e5 100644
--- a/tools/regression/geom/Test/T010/testprg.c
+++ b/tools/regression/geom/Test/T010/testprg.c
@@ -65,7 +65,7 @@ thread_sim(void *ptr __unused)
rattle();
cp = g_dev_opendev("ad0", 1, 0, 0);
g_topology_lock();
- gp = g_create_geomf("BSD-method", cp->provider, NULL);
+ gp = g_create_geomf("BSD-class", cp->provider, NULL);
g_topology_unlock();
printf("gp = %p\n", gp);
rattle();
diff --git a/tools/regression/geom/Test/T011/ref.conf b/tools/regression/geom/Test/T011/ref.conf
index 0a0716ce5395..911704065552 100644
--- a/tools/regression/geom/Test/T011/ref.conf
+++ b/tools/regression/geom/Test/T011/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8071c40]
- DEV-method
+ DEV-class
[0x80b70c0]
- [0x8071c40]
+ [0x8071c40]
ad0
2
@@ -15,25 +15,25 @@
r1w0e0
-
-
+
+
[0x8071b40]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x8071c00]
- MBR-method
-
-
+ MBR-class
+
+
[0x8071c80]
- BSD-method
-
-
+ BSD-class
+
+
[0x8071b00]
- SIMDISK-method
+ SIMDISK-class
[0x80b7040]
- [0x8071b00]
+ [0x8071b00]
ad0
1
@@ -43,5 +43,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T011/testprg.c b/tools/regression/geom/Test/T011/testprg.c
index d9dea04ba3d8..455f6ef96ea9 100644
--- a/tools/regression/geom/Test/T011/testprg.c
+++ b/tools/regression/geom/Test/T011/testprg.c
@@ -65,7 +65,7 @@ thread_sim(void *ptr __unused)
rattle();
cp = g_dev_opendev("ad0", 1, 0, 0);
g_topology_lock();
- gp = g_insert_geom("BSD-method", cp);
+ gp = g_insert_geom("BSD-class", cp);
g_topology_unlock();
printf("gp = %p\n", gp);
rattle();
diff --git a/tools/regression/geom/Test/T012/ref.conf b/tools/regression/geom/Test/T012/ref.conf
index 640cafdfc2a6..5ae3f62300b6 100644
--- a/tools/regression/geom/Test/T012/ref.conf
+++ b/tools/regression/geom/Test/T012/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8072160]
- SUNLABEL-method
+ SUNLABEL-class
[0x80b8480]
- [0x8072160]
+ [0x8072160]
ad0
2
@@ -112,7 +112,7 @@
[0x80b80c0]
- [0x8072160]
+ [0x8072160]
ad0
2
@@ -178,13 +178,13 @@
-
-
+
+
[0x80722e0]
- DEV-method
+ DEV-class
[0x80c5100]
- [0x80722e0]
+ [0x80722e0]
ad0h
3
@@ -196,7 +196,7 @@
[0x80bbf80]
- [0x80722e0]
+ [0x80722e0]
ad0g
3
@@ -208,7 +208,7 @@
[0x80bbe00]
- [0x80722e0]
+ [0x80722e0]
ad0f
3
@@ -220,7 +220,7 @@
[0x80bbc80]
- [0x80722e0]
+ [0x80722e0]
ad0d
3
@@ -232,7 +232,7 @@
[0x80bbb00]
- [0x80722e0]
+ [0x80722e0]
ad0c
3
@@ -244,7 +244,7 @@
[0x80bb980]
- [0x80722e0]
+ [0x80722e0]
ad0b
3
@@ -256,7 +256,7 @@
[0x80bb900]
- [0x80722e0]
+ [0x80722e0]
ad0a
3
@@ -268,7 +268,7 @@
[0x80b86c0]
- [0x80722e0]
+ [0x80722e0]
ad0
2
@@ -280,7 +280,7 @@
[0x80bb580]
- [0x80722e0]
+ [0x80722e0]
ad0h
3
@@ -292,7 +292,7 @@
[0x80bb400]
- [0x80722e0]
+ [0x80722e0]
ad0c
3
@@ -304,7 +304,7 @@
[0x80bb200]
- [0x80722e0]
+ [0x80722e0]
ad0b
3
@@ -316,7 +316,7 @@
[0x80bb180]
- [0x80722e0]
+ [0x80722e0]
ad0a
3
@@ -328,7 +328,7 @@
[0x80b8240]
- [0x80722e0]
+ [0x80722e0]
ad0
2
@@ -338,25 +338,25 @@
r0w0e0
-
-
+
+
[0x80721e0]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x80722a0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8072320]
- BSD-method
-
-
+ BSD-class
+
+
[0x80721a0]
- SIMDISK-method
+ SIMDISK-class
[0x80b8400]
- [0x80721a0]
+ [0x80721a0]
ad0
1
@@ -368,7 +368,7 @@
[0x80b8040]
- [0x80721a0]
+ [0x80721a0]
ad0
1
@@ -378,5 +378,5 @@
ad0
-
+
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 151133d0736b..939145da4d74 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,11 +1,11 @@
$FreeBSD$
-
+
[0x8072220]
- DEV-method
+ DEV-class
[0x80b9380]
- [0x8072220]
+ [0x8072220]
da0c
3
@@ -17,7 +17,7 @@
[0x80b9200]
- [0x8072220]
+ [0x8072220]
da0b
3
@@ -29,7 +29,7 @@
[0x80b9180]
- [0x8072220]
+ [0x8072220]
da0a
3
@@ -41,7 +41,7 @@
[0x80b80c0]
- [0x8072220]
+ [0x8072220]
da0
2
@@ -51,21 +51,21 @@
r0w0e0
-
-
+
+
[0x80721e0]
- MBREXT-method
-
-
+ MBREXT-class
+
+
[0x80721a0]
- MBR-method
-
-
+ MBR-class
+
+
[0x8072260]
- BSD-method
+ BSD-class
[0x80b8140]
- [0x8072260]
+ [0x8072260]
da0
2
@@ -118,13 +118,13 @@
-
-
+
+
[0x80720e0]
- SIMDISK-method
+ SIMDISK-class
[0x80b8040]
- [0x80720e0]
+ [0x80720e0]
da0
1
@@ -134,5 +134,5 @@
da0
-
+
diff --git a/tools/regression/geom/geom.c b/tools/regression/geom/geom.c
index 065612b16ad9..4a95458bbe89 100644
--- a/tools/regression/geom/geom.c
+++ b/tools/regression/geom/geom.c
@@ -123,7 +123,7 @@ main(int argc __unused, char **argv __unused)
setbuf(stdout, NULL);
- printf("Sizeof g_method = %d\n", sizeof(struct g_method));
+ printf("Sizeof g_class = %d\n", sizeof(struct g_class));
printf("Sizeof g_geom = %d\n", sizeof(struct g_geom));
printf("Sizeof g_consumer = %d\n", sizeof(struct g_consumer));
printf("Sizeof g_provider = %d\n", sizeof(struct g_provider));
diff --git a/tools/regression/geom/geom_sim.h b/tools/regression/geom/geom_sim.h
index c0ed68ad5879..0eafb1ba4cf2 100644
--- a/tools/regression/geom/geom_sim.h
+++ b/tools/regression/geom/geom_sim.h
@@ -126,11 +126,11 @@ void g_simdisk_xml_save(char *name, char *file);
void g_simdisk_stop(char *name);
void g_simdisk_restart(char *name);
-#define DECLARE_GEOM_METHOD(method, name) \
+#define DECLARE_GEOM_CLASS(class, name) \
void \
name##_init(void) \
{ \
- g_add_method(&method); \
+ g_add_class(&class); \
}
void g_sunlabel_init(void);
diff --git a/tools/regression/geom/geom_simdev.c b/tools/regression/geom/geom_simdev.c
index 35134d5fda55..fb015f0ce0fb 100644
--- a/tools/regression/geom/geom_simdev.c
+++ b/tools/regression/geom/geom_simdev.c
@@ -49,7 +49,7 @@
static struct g_geom *
-dev_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused)
+dev_taste(struct g_class *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused)
{
struct g_geom *gp;
struct g_consumer *cp;
@@ -57,7 +57,7 @@ dev_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused
g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name);
g_topology_assert();
LIST_FOREACH(cp, &pp->consumers, consumers) {
- if (cp->geom->method == mp) {
+ if (cp->geom->class == mp) {
g_topology_unlock();
return (NULL);
}
@@ -87,13 +87,13 @@ g_dev_orphan(struct g_consumer *cp, struct thread *tp __unused)
}
-static struct g_method dev_method = {
- "DEV-method",
+static struct g_class dev_class = {
+ "DEV-class",
dev_taste,
NULL,
g_dev_orphan,
NULL,
- G_METHOD_INITSTUFF
+ G_CLASS_INITSTUFF
};
static struct g_geom *
@@ -101,7 +101,7 @@ g_dev_findg(char *name)
{
struct g_geom *gp;
- LIST_FOREACH(gp, &dev_method.geom, geom)
+ LIST_FOREACH(gp, &dev_class.geom, geom)
if (!strcmp(gp->name, name))
break;
return (gp);
@@ -111,7 +111,7 @@ void
g_dev_init(void *junk __unused)
{
- g_add_method(&dev_method);
+ g_add_class(&dev_class);
}
diff --git a/tools/regression/geom/geom_simdisk.c b/tools/regression/geom/geom_simdisk.c
index 8c877c954d76..de5d1f951475 100644
--- a/tools/regression/geom/geom_simdisk.c
+++ b/tools/regression/geom/geom_simdisk.c
@@ -47,13 +47,13 @@
#include "geom_simdisk.h"
-struct g_method g_simdisk_method = {
- "SIMDISK-method",
+struct g_class g_simdisk_class = {
+ "SIMDISK-class",
NULL,
g_std_access,
NULL,
NULL,
- G_METHOD_INITSTUFF
+ G_CLASS_INITSTUFF
};
static void
@@ -125,7 +125,7 @@ g_simdisk_start(struct bio *bp)
void
g_simdisk_init(void)
{
- g_add_method(&g_simdisk_method);
+ g_add_class(&g_simdisk_class);
}
struct g_geom *
@@ -137,7 +137,7 @@ g_simdisk_create(char *name, struct simdisk_softc *sc)
printf("g_simdisk_create(\"%s\", %p)\n", name, sc);
g_topology_lock();
- gp = g_new_geomf(&g_simdisk_method, "%s", name);
+ gp = g_new_geomf(&g_simdisk_class, "%s", name);
gp->start = g_simdisk_start;
gp->softc = sc;
@@ -169,7 +169,7 @@ g_simdisk_destroy(char *name)
{
struct g_geom *gp;
- LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+ LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
if (strcmp(name, gp->name))
continue;
gp->flags |= G_GEOM_WITHER;
@@ -228,7 +228,7 @@ g_simdisk_stop(char *name)
struct simdisk_softc *sc;
g_trace(G_T_TOPOLOGY, "g_simdisk_stop(%s)", name);
- LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+ LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
if (strcmp(name, gp->name))
continue;
sc = gp->softc;
@@ -245,7 +245,7 @@ g_simdisk_restart(char *name)
struct bio *bp;
g_trace(G_T_TOPOLOGY, "g_simdisk_restart(%s)", name);
- LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+ LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
if (strcmp(name, gp->name))
continue;
sc = gp->softc;
diff --git a/tools/regression/geom/geom_simdisk.h b/tools/regression/geom/geom_simdisk.h
index b997b95e4e36..cd5783699f6e 100644
--- a/tools/regression/geom/geom_simdisk.h
+++ b/tools/regression/geom/geom_simdisk.h
@@ -55,7 +55,7 @@ struct simdisk_softc {
TAILQ_HEAD(,bio) sort;
};
-extern struct g_method g_simdisk_method;
+extern struct g_class g_simdisk_class;
struct sector * g_simdisk_findsector(struct simdisk_softc *sc, off_t off, int create);
struct g_geom *g_simdisk_create(char *name, struct simdisk_softc *sc);
diff --git a/tools/regression/geom/geom_simdisk_xml.c b/tools/regression/geom/geom_simdisk_xml.c
index 3037fdf2b553..f4cf025f6199 100644
--- a/tools/regression/geom/geom_simdisk_xml.c
+++ b/tools/regression/geom/geom_simdisk_xml.c
@@ -64,7 +64,7 @@ g_simdisk_xml_save(char *name, char *file)
FILE *f;
u_char *p;
- LIST_FOREACH(gp, &g_simdisk_method.geom, geom) {
+ LIST_FOREACH(gp, &g_simdisk_class.geom, geom) {
if (strcmp(name, gp->name))
continue;
sc = gp->softc;
@@ -76,7 +76,7 @@ g_simdisk_xml_save(char *name, char *file)
#if 0
{
struct sbuf *sb;
- sb = g_conf_specific(&g_simdisk_method, gp, NULL, NULL);
+ sb = g_conf_specific(&g_simdisk_class, gp, NULL, NULL);
fprintf(f, " %s\n", sbuf_data(sb));
}
#endif