Redo reference vectors to include the mediasize and sectorsize.

14 files changed, 1012 insertions, 828 deletions

diff --git a/tools/regression/geom/Test/T000/ref.conf b/tools/regression/geom/Test/T000/ref.conf
index 211f608..83518fc1 100644
--- a/tools/regression/geom/Test/T000/ref.conf
+++ b/tools/regression/geom/Test/T000/ref.conf
@@ -1,18 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x805bfc0">
+  <class id="0x806c100">
     <name>DEV-class</name>
   </class>
-  <class id="0x805bfa0">
+  <class id="0x806c0e0">
     <name>MBREXT</name>
   </class>
-  <class id="0x805bf80">
+  <class id="0x806c0c0">
     <name>MBR</name>
   </class>
-  <class id="0x805bfe0">
+  <class id="0x806c120">
     <name>BSD</name>
   </class>
-  <class id="0x805bee0">
+  <class id="0x806c020">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 0a7da28..e8f52b8 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -1,161 +1,163 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>DEV-class</name>
-    <geom id="0x80bfe80">
-      <class ref="0x8072400"/>
+    <geom id="0x80bde00">
+      <class ref="0x8087380"/>
       <name>ad0s3d</name>
       <rank>4</rank>
-	<consumer id="0x80b8440">
-	  <geom ref="0x80bfe80"/>
-	  <provider ref="0x80bf300"/>
+	<consumer id="0x80b9c00">
+	  <geom ref="0x80bde00"/>
+	  <provider ref="0x80bd280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bfd00">
-      <class ref="0x8072400"/>
+    <geom id="0x80bdc80">
+      <class ref="0x8087380"/>
       <name>ad0s3c</name>
       <rank>4</rank>
-	<consumer id="0x80b8400">
-	  <geom ref="0x80bfd00"/>
-	  <provider ref="0x80bf280"/>
+	<consumer id="0x80b9bc0">
+	  <geom ref="0x80bdc80"/>
+	  <provider ref="0x80bd200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bfb80">
-      <class ref="0x8072400"/>
+    <geom id="0x80bdb00">
+      <class ref="0x8087380"/>
       <name>ad0s3a</name>
       <rank>4</rank>
-	<consumer id="0x80b83c0">
-	  <geom ref="0x80bfb80"/>
-	  <provider ref="0x80bf200"/>
+	<consumer id="0x80b9a80">
+	  <geom ref="0x80bdb00"/>
+	  <provider ref="0x80bd180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bfa00">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd980">
+      <class ref="0x8087380"/>
       <name>ad0s2c</name>
       <rank>4</rank>
-	<consumer id="0x80b8380">
-	  <geom ref="0x80bfa00"/>
-	  <provider ref="0x80bce80"/>
+	<consumer id="0x80b9940">
+	  <geom ref="0x80bd980"/>
+	  <provider ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bf880">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd800">
+      <class ref="0x8087380"/>
       <name>ad0s1f</name>
       <rank>4</rank>
-	<consumer id="0x80b8340">
-	  <geom ref="0x80bf880"/>
-	  <provider ref="0x80bcb00"/>
+	<consumer id="0x80b9900">
+	  <geom ref="0x80bd800"/>
+	  <provider ref="0x80b8b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bf700">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd680">
+      <class ref="0x8087380"/>
       <name>ad0s1e</name>
       <rank>4</rank>
-	<consumer id="0x80b8300">
-	  <geom ref="0x80bf700"/>
-	  <provider ref="0x80bca80"/>
+	<consumer id="0x80b98c0">
+	  <geom ref="0x80bd680"/>
+	  <provider ref="0x80b8b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bf580">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd500">
+      <class ref="0x8087380"/>
       <name>ad0s1c</name>
       <rank>4</rank>
-	<consumer id="0x80b82c0">
-	  <geom ref="0x80bf580"/>
-	  <provider ref="0x80bca00"/>
+	<consumer id="0x80b9880">
+	  <geom ref="0x80bd500"/>
+	  <provider ref="0x80b8a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bf400">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd380">
+      <class ref="0x8087380"/>
       <name>ad0s1b</name>
       <rank>4</rank>
-	<consumer id="0x80b8280">
-	  <geom ref="0x80bf400"/>
-	  <provider ref="0x80bc980"/>
+	<consumer id="0x80b9840">
+	  <geom ref="0x80bd380"/>
+	  <provider ref="0x80b8a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bf380">
-      <class ref="0x8072400"/>
+    <geom id="0x80bd300">
+      <class ref="0x8087380"/>
       <name>ad0s1a</name>
       <rank>4</rank>
-	<consumer id="0x80b8240">
-	  <geom ref="0x80bf380"/>
-	  <provider ref="0x80bc900"/>
+	<consumer id="0x80b96c0">
+	  <geom ref="0x80bd300"/>
+	  <provider ref="0x80b8980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bcf00">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8f00">
+      <class ref="0x8087380"/>
       <name>ad0s3</name>
       <rank>3</rank>
-	<consumer id="0x80b81c0">
-	  <geom ref="0x80bcf00"/>
-	  <provider ref="0x80bc480"/>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80b8f00"/>
+	  <provider ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bcb80">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8c00">
+      <class ref="0x8087380"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer id="0x80b8140">
-	  <geom ref="0x80bcb80"/>
-	  <provider ref="0x80bc400"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8c00"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bc580">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8680">
+      <class ref="0x8087380"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80bc580"/>
-	  <provider ref="0x80bc380"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8680"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bc100">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723c0">
+  <class id="0x8087340">
     <name>MBR</name>
-    <geom id="0x80bc180">
-      <class ref="0x80723c0"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087340"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80bc180"/>
-	  <provider ref="0x80bc080"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bc480">
-	  <geom ref="0x80bc180"/>
+	<provider id="0x80b8600">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3</name>
+	  <mediasize>8585256960</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>8585256960</length>
@@ -165,10 +167,12 @@
 	    <type>165</type>
 	  </config>
 	</provider>
-	<provider id="0x80bc400">
-	  <geom ref="0x80bc180"/>
+	<provider id="0x80b8580">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
+	  <mediasize>5364817920</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>5364817920</length>
@@ -178,10 +182,12 @@
 	    <type>165</type>
 	  </config>
 	</provider>
-	<provider id="0x80bc380">
-	  <geom ref="0x80bc180"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
+	  <mediasize>3220406784</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>3220406784</length>
@@ -193,27 +199,29 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>BSD</name>
-    <geom id="0x80bcf80">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8f80">
+      <class ref="0x80873a0"/>
       <name>ad0s3</name>
       <rank>3</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8200">
-	  <geom ref="0x80bcf80"/>
-	  <provider ref="0x80bc480"/>
+	<consumer id="0x80b9b80">
+	  <geom ref="0x80b8f80"/>
+	  <provider ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bf300">
-	  <geom ref="0x80bcf80"/>
+	<provider id="0x80bd280">
+	  <geom ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3d</name>
+	  <mediasize>6488104960</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>3</index>
 	    <length>6488104960</length>
@@ -222,10 +230,12 @@
 	    <secoffset>4096000</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bf280">
-	  <geom ref="0x80bcf80"/>
+	<provider id="0x80bd200">
+	  <geom ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3c</name>
+	  <mediasize>8585256960</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>8585256960</length>
@@ -234,10 +244,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bf200">
-	  <geom ref="0x80bcf80"/>
+	<provider id="0x80bd180">
+	  <geom ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3a</name>
+	  <mediasize>2097152000</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>2097152000</length>
@@ -247,25 +259,27 @@
 	  </config>
 	</provider>
     </geom>
-    <geom id="0x80bcc00">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8c80">
+      <class ref="0x80873a0"/>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8180">
-	  <geom ref="0x80bcc00"/>
-	  <provider ref="0x80bc400"/>
+	<consumer id="0x80b9a40">
+	  <geom ref="0x80b8c80"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bce80">
-	  <geom ref="0x80bcc00"/>
+	<provider id="0x80b8e80">
+	  <geom ref="0x80b8c80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2c</name>
+	  <mediasize>5364817920</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>5364817920</length>
@@ -275,25 +289,27 @@
 	  </config>
 	</provider>
     </geom>
-    <geom id="0x80bc600">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8700">
+      <class ref="0x80873a0"/>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80bc600"/>
-	  <provider ref="0x80bc380"/>
+	<consumer id="0x80b9800">
+	  <geom ref="0x80b8700"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bcb00">
-	  <geom ref="0x80bc600"/>
+	<provider id="0x80b8b80">
+	  <geom ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
+	  <mediasize>2066973184</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>2066973184</length>
@@ -302,10 +318,12 @@
 	    <secoffset>2252800</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bca80">
-	  <geom ref="0x80bc600"/>
+	<provider id="0x80b8b00">
+	  <geom ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
+	  <mediasize>524288000</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>4</index>
 	    <length>524288000</length>
@@ -314,10 +332,12 @@
 	    <secoffset>1228800</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bca00">
-	  <geom ref="0x80bc600"/>
+	<provider id="0x80b8a80">
+	  <geom ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
+	  <mediasize>3220406784</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>3220406784</length>
@@ -326,10 +346,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc980">
-	  <geom ref="0x80bc600"/>
+	<provider id="0x80b8a00">
+	  <geom ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
+	  <mediasize>524288000</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>524288000</length>
@@ -338,10 +360,12 @@
 	    <secoffset>204800</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc900">
-	  <geom ref="0x80bc600"/>
+	<provider id="0x80b8980">
+	  <geom ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
+	  <mediasize>104857600</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>104857600</length>
@@ -352,16 +376,18 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072320">
+  <class id="0x80872a0">
     <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8072320"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index 98d17a0..dc852781 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -1,61 +1,63 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>DEV-class</name>
-    <geom id="0x80b9580">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8680">
+      <class ref="0x8087380"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80b9580"/>
-	  <provider ref="0x80b9400"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8680"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9500">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8600">
+      <class ref="0x8087380"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80b9500"/>
-	  <provider ref="0x80b9380"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8600"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9100">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80b9100"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723c0">
+  <class id="0x8087340">
     <name>MBR</name>
-    <geom id="0x80b9180">
-      <class ref="0x80723c0"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087340"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80b9180"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80b9400">
-	  <geom ref="0x80b9180"/>
+	<provider id="0x80b8580">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
+	  <mediasize>4564740096</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>4564740096</length>
@@ -65,10 +67,12 @@
 	    <type>11</type>
 	  </config>
 	</provider>
-	<provider id="0x80b9380">
-	  <geom ref="0x80b9180"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
+	  <mediasize>296821760</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>296821760</length>
@@ -80,19 +84,21 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>BSD</name>
   </class>
-  <class id="0x8072320">
+  <class id="0x80872a0">
     <name>SIMDISK-class</name>
-    <geom id="0x80b9000">
-      <class ref="0x8072320"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80b9080">
-	  <geom ref="0x80b9000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index d981554..3631934 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -1,288 +1,290 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>DEV-class</name>
-    <geom id="0x80ca580">
-      <class ref="0x8072400"/>
+    <geom id="0x80cc680">
+      <class ref="0x8087380"/>
       <name>ad0s27</name>
       <rank>4</rank>
-	<consumer id="0x80b8700">
-	  <geom ref="0x80ca580"/>
-	  <provider ref="0x80c3400"/>
+	<consumer id="0x80b9d80">
+	  <geom ref="0x80cc680"/>
+	  <provider ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80ca400">
-      <class ref="0x8072400"/>
+    <geom id="0x80cc500">
+      <class ref="0x8087380"/>
       <name>ad0s26</name>
       <rank>4</rank>
-	<consumer id="0x80b86c0">
-	  <geom ref="0x80ca400"/>
-	  <provider ref="0x80c3380"/>
+	<consumer id="0x80b9d40">
+	  <geom ref="0x80cc500"/>
+	  <provider ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80ca280">
-      <class ref="0x8072400"/>
+    <geom id="0x80cc380">
+      <class ref="0x8087380"/>
       <name>ad0s25</name>
       <rank>4</rank>
-	<consumer id="0x80b8680">
-	  <geom ref="0x80ca280"/>
-	  <provider ref="0x80c3300"/>
+	<consumer id="0x80b9d00">
+	  <geom ref="0x80cc380"/>
+	  <provider ref="0x80bc400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80ca100">
-      <class ref="0x8072400"/>
+    <geom id="0x80cc200">
+      <class ref="0x8087380"/>
       <name>ad0s24</name>
       <rank>4</rank>
-	<consumer id="0x80b8640">
-	  <geom ref="0x80ca100"/>
-	  <provider ref="0x80c3280"/>
+	<consumer id="0x80b9cc0">
+	  <geom ref="0x80cc200"/>
+	  <provider ref="0x80bc380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5f80">
-      <class ref="0x8072400"/>
+    <geom id="0x80cc080">
+      <class ref="0x8087380"/>
       <name>ad0s23</name>
       <rank>4</rank>
-	<consumer id="0x80b8600">
-	  <geom ref="0x80c5f80"/>
-	  <provider ref="0x80c3200"/>
+	<consumer id="0x80b9c80">
+	  <geom ref="0x80cc080"/>
+	  <provider ref="0x80bc300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5e00">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0f00">
+      <class ref="0x8087380"/>
       <name>ad0s22</name>
       <rank>4</rank>
-	<consumer id="0x80b85c0">
-	  <geom ref="0x80c5e00"/>
-	  <provider ref="0x80c3180"/>
+	<consumer id="0x80b9c40">
+	  <geom ref="0x80c0f00"/>
+	  <provider ref="0x80bc280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5c80">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0d80">
+      <class ref="0x8087380"/>
       <name>ad0s21</name>
       <rank>4</rank>
-	<consumer id="0x80b8580">
-	  <geom ref="0x80c5c80"/>
-	  <provider ref="0x80c3100"/>
+	<consumer id="0x80b9c00">
+	  <geom ref="0x80c0d80"/>
+	  <provider ref="0x80bc200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5b00">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0c00">
+      <class ref="0x8087380"/>
       <name>ad0s20</name>
       <rank>4</rank>
-	<consumer id="0x80b8540">
-	  <geom ref="0x80c5b00"/>
-	  <provider ref="0x80c3080"/>
+	<consumer id="0x80b9bc0">
+	  <geom ref="0x80c0c00"/>
+	  <provider ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5980">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0a80">
+      <class ref="0x8087380"/>
       <name>ad0s19</name>
       <rank>4</rank>
-	<consumer id="0x80b8500">
-	  <geom ref="0x80c5980"/>
-	  <provider ref="0x80c3000"/>
+	<consumer id="0x80b9b80">
+	  <geom ref="0x80c0a80"/>
+	  <provider ref="0x80bc100"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5800">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0900">
+      <class ref="0x8087380"/>
       <name>ad0s18</name>
       <rank>4</rank>
-	<consumer id="0x80b84c0">
-	  <geom ref="0x80c5800"/>
-	  <provider ref="0x80c0f80"/>
+	<consumer id="0x80b9b40">
+	  <geom ref="0x80c0900"/>
+	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5680">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0780">
+      <class ref="0x8087380"/>
       <name>ad0s17</name>
       <rank>4</rank>
-	<consumer id="0x80b8480">
-	  <geom ref="0x80c5680"/>
-	  <provider ref="0x80c0f00"/>
+	<consumer id="0x80b9b00">
+	  <geom ref="0x80c0780"/>
+	  <provider ref="0x80bc000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5500">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0600">
+      <class ref="0x8087380"/>
       <name>ad0s16</name>
       <rank>4</rank>
-	<consumer id="0x80b8440">
-	  <geom ref="0x80c5500"/>
-	  <provider ref="0x80c0e80"/>
+	<consumer id="0x80b9ac0">
+	  <geom ref="0x80c0600"/>
+	  <provider ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5380">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0480">
+      <class ref="0x8087380"/>
       <name>ad0s15</name>
       <rank>4</rank>
-	<consumer id="0x80b8400">
-	  <geom ref="0x80c5380"/>
-	  <provider ref="0x80c0e00"/>
+	<consumer id="0x80b9a80">
+	  <geom ref="0x80c0480"/>
+	  <provider ref="0x80b8f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5200">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0300">
+      <class ref="0x8087380"/>
       <name>ad0s14</name>
       <rank>4</rank>
-	<consumer id="0x80b83c0">
-	  <geom ref="0x80c5200"/>
-	  <provider ref="0x80c0d80"/>
+	<consumer id="0x80b9a40">
+	  <geom ref="0x80c0300"/>
+	  <provider ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c5080">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0180">
+      <class ref="0x8087380"/>
       <name>ad0s13</name>
       <rank>4</rank>
-	<consumer id="0x80b8380">
-	  <geom ref="0x80c5080"/>
-	  <provider ref="0x80c0d00"/>
+	<consumer id="0x80b9a00">
+	  <geom ref="0x80c0180"/>
+	  <provider ref="0x80b8e00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3f00">
-      <class ref="0x8072400"/>
+    <geom id="0x80c0000">
+      <class ref="0x8087380"/>
       <name>ad0s12</name>
       <rank>4</rank>
-	<consumer id="0x80b8340">
-	  <geom ref="0x80c3f00"/>
-	  <provider ref="0x80c0c80"/>
+	<consumer id="0x80b99c0">
+	  <geom ref="0x80c0000"/>
+	  <provider ref="0x80b8d80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3d80">
-      <class ref="0x8072400"/>
+    <geom id="0x80bce80">
+      <class ref="0x8087380"/>
       <name>ad0s11</name>
       <rank>4</rank>
-	<consumer id="0x80b8300">
-	  <geom ref="0x80c3d80"/>
-	  <provider ref="0x80c0c00"/>
+	<consumer id="0x80b9980">
+	  <geom ref="0x80bce80"/>
+	  <provider ref="0x80b8d00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3c00">
-      <class ref="0x8072400"/>
+    <geom id="0x80bcd00">
+      <class ref="0x8087380"/>
       <name>ad0s10</name>
       <rank>4</rank>
-	<consumer id="0x80b82c0">
-	  <geom ref="0x80c3c00"/>
-	  <provider ref="0x80c0b80"/>
+	<consumer id="0x80b9940">
+	  <geom ref="0x80bcd00"/>
+	  <provider ref="0x80b8c80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3a80">
-      <class ref="0x8072400"/>
+    <geom id="0x80bcb80">
+      <class ref="0x8087380"/>
       <name>ad0s9</name>
       <rank>4</rank>
-	<consumer id="0x80b8280">
-	  <geom ref="0x80c3a80"/>
-	  <provider ref="0x80c0b00"/>
+	<consumer id="0x80b9900">
+	  <geom ref="0x80bcb80"/>
+	  <provider ref="0x80b8c00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3900">
-      <class ref="0x8072400"/>
+    <geom id="0x80bca00">
+      <class ref="0x8087380"/>
       <name>ad0s8</name>
       <rank>4</rank>
-	<consumer id="0x80b8240">
-	  <geom ref="0x80c3900"/>
-	  <provider ref="0x80c0a80"/>
+	<consumer id="0x80b98c0">
+	  <geom ref="0x80bca00"/>
+	  <provider ref="0x80b8b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3780">
-      <class ref="0x8072400"/>
+    <geom id="0x80bc880">
+      <class ref="0x8087380"/>
       <name>ad0s7</name>
       <rank>4</rank>
-	<consumer id="0x80b8200">
-	  <geom ref="0x80c3780"/>
-	  <provider ref="0x80c0a00"/>
+	<consumer id="0x80b9880">
+	  <geom ref="0x80bc880"/>
+	  <provider ref="0x80b8b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3600">
-      <class ref="0x8072400"/>
+    <geom id="0x80bc700">
+      <class ref="0x8087380"/>
       <name>ad0s6</name>
       <rank>4</rank>
-	<consumer id="0x80b81c0">
-	  <geom ref="0x80c3600"/>
-	  <provider ref="0x80c0980"/>
+	<consumer id="0x80b9840">
+	  <geom ref="0x80bc700"/>
+	  <provider ref="0x80b8a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c3480">
-      <class ref="0x8072400"/>
+    <geom id="0x80bc580">
+      <class ref="0x8087380"/>
       <name>ad0s5</name>
       <rank>4</rank>
-	<consumer id="0x80b8180">
-	  <geom ref="0x80c3480"/>
-	  <provider ref="0x80c0900"/>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80bc580"/>
+	  <provider ref="0x80b8a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c0580">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8680">
+      <class ref="0x8087380"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80c0580"/>
-	  <provider ref="0x80c0400"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8680"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c0500">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8600">
+      <class ref="0x8087380"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80c0500"/>
-	  <provider ref="0x80c0380"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8600"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c0100">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80c0100"/>
-	  <provider ref="0x80c0080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBREXT</name>
-    <geom id="0x80c0780">
-      <class ref="0x80723e0"/>
+    <geom id="0x80b8880">
+      <class ref="0x8087360"/>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer id="0x80b8140">
-	  <geom ref="0x80c0780"/>
-	  <provider ref="0x80c0400"/>
+	<consumer id="0x80b9800">
+	  <geom ref="0x80b8880"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80c3400">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc500">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s27</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>22</index>
 	    <length>8193024</length>
@@ -292,10 +294,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3380">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc480">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s26</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>21</index>
 	    <length>8193024</length>
@@ -305,10 +309,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3300">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc400">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s25</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>20</index>
 	    <length>8193024</length>
@@ -318,10 +324,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3280">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc380">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s24</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>19</index>
 	    <length>8193024</length>
@@ -331,10 +339,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3200">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc300">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s23</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>18</index>
 	    <length>8193024</length>
@@ -344,10 +354,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3180">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc280">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s22</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>17</index>
 	    <length>8193024</length>
@@ -357,10 +369,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3100">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc200">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s21</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>16</index>
 	    <length>8193024</length>
@@ -370,10 +384,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3080">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc180">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s20</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>15</index>
 	    <length>8193024</length>
@@ -383,10 +399,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c3000">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc100">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s19</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>14</index>
 	    <length>8193024</length>
@@ -396,10 +414,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0f80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc080">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s18</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>13</index>
 	    <length>8193024</length>
@@ -409,10 +429,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0f00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80bc000">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s17</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>12</index>
 	    <length>8193024</length>
@@ -422,10 +444,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0e80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8f80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s16</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>11</index>
 	    <length>8193024</length>
@@ -435,10 +459,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0e00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8f00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s15</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>10</index>
 	    <length>8193024</length>
@@ -448,10 +474,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0d80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8e80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s14</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>9</index>
 	    <length>8193024</length>
@@ -461,10 +489,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0d00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8e00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s13</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>8</index>
 	    <length>8193024</length>
@@ -474,10 +504,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0c80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8d80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s12</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>7</index>
 	    <length>8193024</length>
@@ -487,10 +519,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0c00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8d00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s11</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>6</index>
 	    <length>8193024</length>
@@ -500,10 +534,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0b80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8c80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s10</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>8193024</length>
@@ -513,10 +549,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0b00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8c00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s9</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>4</index>
 	    <length>8193024</length>
@@ -526,10 +564,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0a80">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8b80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s8</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>3</index>
 	    <length>8193024</length>
@@ -539,10 +579,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0a00">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8b00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s7</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>8193024</length>
@@ -552,10 +594,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0980">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8a80">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s6</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>8193024</length>
@@ -565,10 +609,12 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0900">
-	  <geom ref="0x80c0780"/>
+	<provider id="0x80b8a00">
+	  <geom ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s5</name>
+	  <mediasize>8193024</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>8193024</length>
@@ -580,26 +626,28 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x80723c0">
+  <class id="0x8087340">
     <name>MBR</name>
-    <geom id="0x80c0180">
-      <class ref="0x80723c0"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087340"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80c0180"/>
-	  <provider ref="0x80c0080"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80c0400">
-	  <geom ref="0x80c0180"/>
+	<provider id="0x80b8580">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
+	  <mediasize>427714560</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>427714560</length>
@@ -609,10 +657,12 @@
 	    <type>5</type>
 	  </config>
 	</provider>
-	<provider id="0x80c0380">
-	  <geom ref="0x80c0180"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
+	  <mediasize>2146765824</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>2146765824</length>
@@ -624,19 +674,21 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>BSD</name>
   </class>
-  <class id="0x8072320">
+  <class id="0x80872a0">
     <name>SIMDISK-class</name>
-    <geom id="0x80c0000">
-      <class ref="0x8072320"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80c0080">
-	  <geom ref="0x80c0000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 6a8eeb7..3548da0 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -1,131 +1,133 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072420">
+  <class id="0x80873c0">
     <name>DEV-class</name>
-    <geom id="0x80be580">
-      <class ref="0x8072420"/>
+    <geom id="0x80bd600">
+      <class ref="0x80873c0"/>
       <name>ad0s1h</name>
       <rank>4</rank>
-	<consumer id="0x80b8300">
-	  <geom ref="0x80be580"/>
-	  <provider ref="0x80bcb80"/>
+	<consumer id="0x80b9940">
+	  <geom ref="0x80bd600"/>
+	  <provider ref="0x80b8c00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80be400">
-      <class ref="0x8072420"/>
+    <geom id="0x80bd480">
+      <class ref="0x80873c0"/>
       <name>ad0s1g</name>
       <rank>4</rank>
-	<consumer id="0x80b82c0">
-	  <geom ref="0x80be400"/>
-	  <provider ref="0x80bcb00"/>
+	<consumer id="0x80b9900">
+	  <geom ref="0x80bd480"/>
+	  <provider ref="0x80b8b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80be280">
-      <class ref="0x8072420"/>
+    <geom id="0x80bd300">
+      <class ref="0x80873c0"/>
       <name>ad0s1f</name>
       <rank>4</rank>
-	<consumer id="0x80b8280">
-	  <geom ref="0x80be280"/>
-	  <provider ref="0x80bca80"/>
+	<consumer id="0x80b98c0">
+	  <geom ref="0x80bd300"/>
+	  <provider ref="0x80b8b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80be100">
-      <class ref="0x8072420"/>
+    <geom id="0x80bd180">
+      <class ref="0x80873c0"/>
       <name>ad0s1e</name>
       <rank>4</rank>
-	<consumer id="0x80b8240">
-	  <geom ref="0x80be100"/>
-	  <provider ref="0x80bca00"/>
+	<consumer id="0x80b9880">
+	  <geom ref="0x80bd180"/>
+	  <provider ref="0x80b8a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bcf80">
-      <class ref="0x8072420"/>
+    <geom id="0x80bd000">
+      <class ref="0x80873c0"/>
       <name>ad0s1d</name>
       <rank>4</rank>
-	<consumer id="0x80b8200">
-	  <geom ref="0x80bcf80"/>
-	  <provider ref="0x80bc980"/>
+	<consumer id="0x80b9840">
+	  <geom ref="0x80bd000"/>
+	  <provider ref="0x80b8a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bce00">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8e80">
+      <class ref="0x80873c0"/>
       <name>ad0s1c</name>
       <rank>4</rank>
-	<consumer id="0x80b81c0">
-	  <geom ref="0x80bce00"/>
-	  <provider ref="0x80bc900"/>
+	<consumer id="0x80b9800">
+	  <geom ref="0x80b8e80"/>
+	  <provider ref="0x80b8980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bcc80">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8d00">
+      <class ref="0x80873c0"/>
       <name>ad0s1b</name>
       <rank>4</rank>
-	<consumer id="0x80b8180">
-	  <geom ref="0x80bcc80"/>
-	  <provider ref="0x80bc880"/>
+	<consumer id="0x80b97c0">
+	  <geom ref="0x80b8d00"/>
+	  <provider ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bcc00">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8c80">
+      <class ref="0x80873c0"/>
       <name>ad0s1a</name>
       <rank>4</rank>
-	<consumer id="0x80b8140">
-	  <geom ref="0x80bcc00"/>
-	  <provider ref="0x80bc800"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8c80"/>
+	  <provider ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bc480">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8580">
+      <class ref="0x80873c0"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80bc480"/>
-	  <provider ref="0x80bc380"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8580"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80bc100">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8280">
+      <class ref="0x80873c0"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x8072400">
+  <class id="0x80873a0">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087380">
     <name>MBR</name>
-    <geom id="0x80bc180">
-      <class ref="0x80723e0"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80bc180"/>
-	  <provider ref="0x80bc080"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bc380">
-	  <geom ref="0x80bc180"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
+	  <mediasize>20003848704</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>20003848704</length>
@@ -137,27 +139,29 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072440">
+  <class id="0x80873e0">
     <name>BSD</name>
-    <geom id="0x80bc500">
-      <class ref="0x8072440"/>
+    <geom id="0x80b8600">
+      <class ref="0x80873e0"/>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80bc500"/>
-	  <provider ref="0x80bc380"/>
+	<consumer id="0x80b9780">
+	  <geom ref="0x80b8600"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80bcb80">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8c00">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1h</name>
+	  <mediasize>5368709120</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>7</index>
 	    <length>5368709120</length>
@@ -166,10 +170,12 @@
 	    <secoffset>19898368</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bcb00">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8b80">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1g</name>
+	  <mediasize>3221225472</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>6</index>
 	    <length>3221225472</length>
@@ -178,10 +184,12 @@
 	    <secoffset>13606912</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bca80">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8b00">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
+	  <mediasize>4294967296</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>4294967296</length>
@@ -190,10 +198,12 @@
 	    <secoffset>5218304</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bca00">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8a80">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
+	  <mediasize>524288000</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>4</index>
 	    <length>524288000</length>
@@ -202,10 +212,12 @@
 	    <secoffset>4194304</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc980">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8a00">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1d</name>
+	  <mediasize>4447175168</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>3</index>
 	    <length>4447175168</length>
@@ -214,10 +226,12 @@
 	    <secoffset>30384128</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc900">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8980">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
+	  <mediasize>20003848704</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>20003848704</length>
@@ -226,10 +240,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc880">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8900">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
+	  <mediasize>1073741824</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>1073741824</length>
@@ -238,10 +254,12 @@
 	    <secoffset>2097152</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80bc800">
-	  <geom ref="0x80bc500"/>
+	<provider id="0x80b8880">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
+	  <mediasize>1073741824</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>1073741824</length>
@@ -252,16 +270,18 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072340">
+  <class id="0x80872e0">
     <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8072340"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872e0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 8f61f3a..60e2af9 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -1,75 +1,77 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>DEV-class</name>
-    <geom id="0x80b9780">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8880">
+      <class ref="0x8087380"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer id="0x80b8140">
-	  <geom ref="0x80b9780"/>
-	  <provider ref="0x80b9500"/>
+	<consumer id="0x80b96c0">
+	  <geom ref="0x80b8880"/>
+	  <provider ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9600">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8700">
+      <class ref="0x8087380"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80b9600"/>
-	  <provider ref="0x80b9480"/>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80b8700"/>
+	  <provider ref="0x80b8580"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9580">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8680">
+      <class ref="0x8087380"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80b9580"/>
-	  <provider ref="0x80b9400"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8680"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9100">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80b9100"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723c0">
+  <class id="0x8087340">
     <name>MBR</name>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>BSD</name>
-    <geom id="0x80b9180">
-      <class ref="0x8072420"/>
+    <geom id="0x80b8300">
+      <class ref="0x80873a0"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80b9180"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80b9500">
-	  <geom ref="0x80b9180"/>
+	<provider id="0x80b8600">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
+	  <mediasize>1474560</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>1474560</length>
@@ -78,10 +80,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9480">
-	  <geom ref="0x80b9180"/>
+	<provider id="0x80b8580">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
+	  <mediasize>1474560</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>1474560</length>
@@ -90,10 +94,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9400">
-	  <geom ref="0x80b9180"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
+	  <mediasize>1474560</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>1474560</length>
@@ -104,16 +110,18 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072320">
+  <class id="0x80872a0">
     <name>SIMDISK-class</name>
-    <geom id="0x80b9000">
-      <class ref="0x8072320"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80b9080">
-	  <geom ref="0x80b9000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T006/ref.conf b/tools/regression/geom/Test/T006/ref.conf
index 9d18a0f..ded94cd 100644
--- a/tools/regression/geom/Test/T006/ref.conf
+++ b/tools/regression/geom/Test/T006/ref.conf
@@ -1,37 +1,39 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>DEV-class</name>
-    <geom id="0x80b9100">
-      <class ref="0x8072400"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087380"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80b9100"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723c0">
+  <class id="0x8087340">
     <name>MBR</name>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>BSD</name>
   </class>
-  <class id="0x8072320">
+  <class id="0x80872a0">
     <name>SIMDISK-class</name>
-    <geom id="0x80b9000">
-      <class ref="0x8072320"/>
+    <geom id="0x80b8180">
+      <class ref="0x80872a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80b9080">
-	  <geom ref="0x80b9000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T007/ref.conf b/tools/regression/geom/Test/T007/ref.conf
index 98849b2..275d6b9 100644
--- a/tools/regression/geom/Test/T007/ref.conf
+++ b/tools/regression/geom/Test/T007/ref.conf
@@ -1,18 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>DEV-class</name>
   </class>
-  <class id="0x8072400">
+  <class id="0x8087380">
     <name>MBREXT</name>
   </class>
-  <class id="0x80723e0">
+  <class id="0x8087360">
     <name>MBR</name>
   </class>
-  <class id="0x8072440">
+  <class id="0x80873c0">
     <name>BSD</name>
   </class>
-  <class id="0x8072340">
+  <class id="0x80872c0">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T008/ref.conf b/tools/regression/geom/Test/T008/ref.conf
index c480763..73a023b 100644
--- a/tools/regression/geom/Test/T008/ref.conf
+++ b/tools/regression/geom/Test/T008/ref.conf
@@ -1,18 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072460">
+  <class id="0x80873e0">
     <name>DEV-class</name>
   </class>
-  <class id="0x8072440">
+  <class id="0x80873c0">
     <name>MBREXT</name>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873a0">
     <name>MBR</name>
   </class>
-  <class id="0x8072480">
+  <class id="0x8087400">
     <name>BSD</name>
   </class>
-  <class id="0x8072380">
+  <class id="0x8087300">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T009/ref.conf b/tools/regression/geom/Test/T009/ref.conf
index c59e0c0..caea5ce 100644
--- a/tools/regression/geom/Test/T009/ref.conf
+++ b/tools/regression/geom/Test/T009/ref.conf
@@ -1,18 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80724e0">
+  <class id="0x8087100">
     <name>DEV-class</name>
   </class>
-  <class id="0x80724c0">
+  <class id="0x80870e0">
     <name>MBREXT</name>
   </class>
-  <class id="0x80724a0">
+  <class id="0x80870c0">
     <name>MBR</name>
   </class>
-  <class id="0x8072500">
+  <class id="0x8087120">
     <name>BSD</name>
   </class>
-  <class id="0x8072400">
+  <class id="0x8087020">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T011/ref.conf b/tools/regression/geom/Test/T011/ref.conf
index 6d12ea4..8461dce 100644
--- a/tools/regression/geom/Test/T011/ref.conf
+++ b/tools/regression/geom/Test/T011/ref.conf
@@ -1,37 +1,39 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8072460">
+  <class id="0x8087400">
     <name>DEV-class</name>
-    <geom id="0x80bb180">
-      <class ref="0x8072460"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087400"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80bb180"/>
-	  <provider ref="0x80bb100"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8280"/>
 	  <mode>r1w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x8072440">
+  <class id="0x80873e0">
     <name>MBREXT</name>
   </class>
-  <class id="0x8072420">
+  <class id="0x80873c0">
     <name>MBR</name>
   </class>
-  <class id="0x8072480">
+  <class id="0x8087420">
     <name>BSD</name>
   </class>
-  <class id="0x8072380">
+  <class id="0x8087320">
     <name>SIMDISK-class</name>
-    <geom id="0x80bb080">
-      <class ref="0x8072380"/>
+    <geom id="0x80b8180">
+      <class ref="0x8087320"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80bb100">
-	  <geom ref="0x80bb080"/>
+	<provider id="0x80b8280">
+	  <geom ref="0x80b8180"/>
 	  <mode>r1w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1474560</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T012/ref.conf b/tools/regression/geom/Test/T012/ref.conf
index eceb6978..f6ad633 100644
--- a/tools/regression/geom/Test/T012/ref.conf
+++ b/tools/regression/geom/Test/T012/ref.conf
@@ -1,25 +1,27 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80729a0">
+  <class id="0x8087020">
     <name>SUN</name>
-    <geom id="0x80b9d00">
-      <class ref="0x80729a0"/>
+    <geom id="0x80b8e80">
+      <class ref="0x8087020"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8200">
-	  <geom ref="0x80b9d00"/>
-	  <provider ref="0x80b9c80"/>
+	<consumer id="0x80b9a40">
+	  <geom ref="0x80b8e80"/>
+	  <provider ref="0x80b8e00"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80c1080">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80c2200">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
+	  <mediasize>1343787008</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>7</index>
 	    <length>1343787008</length>
@@ -28,10 +30,12 @@
 	    <secoffset>11011944</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80c1000">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80c2180">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0g</name>
+	  <mediasize>2149576704</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>6</index>
 	    <length>2149576704</length>
@@ -40,10 +44,12 @@
 	    <secoffset>6813552</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9f80">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80c2100">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0f</name>
+	  <mediasize>2149576704</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>2149576704</length>
@@ -52,10 +58,12 @@
 	    <secoffset>2615160</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9f00">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80c2080">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0d</name>
+	  <mediasize>11124240384</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>3</index>
 	    <length>11124240384</length>
@@ -64,10 +72,12 @@
 	    <secoffset>13636528</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9e80">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80c2000">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
+	  <mediasize>18108555264</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>18108555264</length>
@@ -76,10 +86,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9e00">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80b8f80">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
+	  <mediasize>1075994624</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>1075994624</length>
@@ -88,10 +100,12 @@
 	    <secoffset>513608</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9d80">
-	  <geom ref="0x80b9d00"/>
+	<provider id="0x80b8f00">
+	  <geom ref="0x80b8e80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
+	  <mediasize>262967296</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>262967296</length>
@@ -101,24 +115,26 @@
 	  </config>
 	</provider>
     </geom>
-    <geom id="0x80b9100">
-      <class ref="0x80729a0"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087020"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b8040">
-	  <geom ref="0x80b9100"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b95c0">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80b9380">
-	  <geom ref="0x80b9100"/>
+	<provider id="0x80b8500">
+	  <geom ref="0x80b8280"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
+	  <mediasize>34629267456</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>7</index>
 	    <length>34629267456</length>
@@ -127,10 +143,12 @@
 	    <secoffset>4041072</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9300">
-	  <geom ref="0x80b9100"/>
+	<provider id="0x80b8480">
+	  <geom ref="0x80b8280"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
+	  <mediasize>36698296320</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>36698296320</length>
@@ -139,10 +157,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9280">
-	  <geom ref="0x80b9100"/>
+	<provider id="0x80b8400">
+	  <geom ref="0x80b8280"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
+	  <mediasize>539320320</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>539320320</length>
@@ -151,10 +171,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80b9200">
-	  <geom ref="0x80b9100"/>
+	<provider id="0x80b8380">
+	  <geom ref="0x80b8280"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
+	  <mediasize>1529708544</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>1529708544</length>
@@ -165,168 +187,172 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8072aa0">
+  <class id="0x8087120">
     <name>DEV-class</name>
-    <geom id="0x80c1a80">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2c00">
+      <class ref="0x8087120"/>
       <name>ad0h</name>
       <rank>3</rank>
-	<consumer id="0x80b8400">
-	  <geom ref="0x80c1a80"/>
-	  <provider ref="0x80c1080"/>
+	<consumer id="0x80b9bc0">
+	  <geom ref="0x80c2c00"/>
+	  <provider ref="0x80c2200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1900">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2a80">
+      <class ref="0x8087120"/>
       <name>ad0g</name>
       <rank>3</rank>
-	<consumer id="0x80b83c0">
-	  <geom ref="0x80c1900"/>
-	  <provider ref="0x80c1000"/>
+	<consumer id="0x80b9b80">
+	  <geom ref="0x80c2a80"/>
+	  <provider ref="0x80c2180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1780">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2900">
+      <class ref="0x8087120"/>
       <name>ad0f</name>
       <rank>3</rank>
-	<consumer id="0x80b8380">
-	  <geom ref="0x80c1780"/>
-	  <provider ref="0x80b9f80"/>
+	<consumer id="0x80b9b40">
+	  <geom ref="0x80c2900"/>
+	  <provider ref="0x80c2100"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1600">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2780">
+      <class ref="0x8087120"/>
       <name>ad0d</name>
       <rank>3</rank>
-	<consumer id="0x80b8340">
-	  <geom ref="0x80c1600"/>
-	  <provider ref="0x80b9f00"/>
+	<consumer id="0x80b9b00">
+	  <geom ref="0x80c2780"/>
+	  <provider ref="0x80c2080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1480">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2600">
+      <class ref="0x8087120"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer id="0x80b8300">
-	  <geom ref="0x80c1480"/>
-	  <provider ref="0x80b9e80"/>
+	<consumer id="0x80b9ac0">
+	  <geom ref="0x80c2600"/>
+	  <provider ref="0x80c2000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1300">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2480">
+      <class ref="0x8087120"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer id="0x80b82c0">
-	  <geom ref="0x80c1300"/>
-	  <provider ref="0x80b9e00"/>
+	<consumer id="0x80b9a80">
+	  <geom ref="0x80c2480"/>
+	  <provider ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1180">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2300">
+      <class ref="0x8087120"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer id="0x80b8280">
-	  <geom ref="0x80c1180"/>
-	  <provider ref="0x80b9d80"/>
+	<consumer id="0x80b99c0">
+	  <geom ref="0x80c2300"/>
+	  <provider ref="0x80b8f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80c1100">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80c2280">
+      <class ref="0x8087120"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8240">
-	  <geom ref="0x80c1100"/>
-	  <provider ref="0x80b9c80"/>
+	<consumer id="0x80b9c40">
+	  <geom ref="0x80c2280"/>
+	  <provider ref="0x80b8e00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9980">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80b8b00">
+      <class ref="0x8087120"/>
       <name>ad0h</name>
       <rank>3</rank>
-	<consumer id="0x80b8180">
-	  <geom ref="0x80b9980"/>
-	  <provider ref="0x80b9380"/>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80b8b00"/>
+	  <provider ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9800">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80b8980">
+      <class ref="0x8087120"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer id="0x80b8140">
-	  <geom ref="0x80b9800"/>
-	  <provider ref="0x80b9300"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8980"/>
+	  <provider ref="0x80b8480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9600">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80b8780">
+      <class ref="0x8087120"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer id="0x80b8100">
-	  <geom ref="0x80b9600"/>
-	  <provider ref="0x80b9280"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8780"/>
+	  <provider ref="0x80b8400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9480">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80b8600">
+      <class ref="0x8087120"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer id="0x80b80c0">
-	  <geom ref="0x80b9480"/>
-	  <provider ref="0x80b9200"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8600"/>
+	  <provider ref="0x80b8380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b9400">
-      <class ref="0x8072aa0"/>
+    <geom id="0x80b8580">
+      <class ref="0x8087120"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer id="0x80b8080">
-	  <geom ref="0x80b9400"/>
-	  <provider ref="0x80b9080"/>
+	<consumer id="0x80b9700">
+	  <geom ref="0x80b8580"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x8072a80">
+  <class id="0x8087100">
     <name>MBREXT</name>
   </class>
-  <class id="0x8072a60">
+  <class id="0x80870e0">
     <name>MBR</name>
   </class>
-  <class id="0x8072ac0">
+  <class id="0x8087140">
     <name>BSD</name>
   </class>
-  <class id="0x80729c0">
+  <class id="0x8087040">
     <name>SIMDISK-class</name>
-    <geom id="0x80b9b00">
-      <class ref="0x80729c0"/>
+    <geom id="0x80b8c80">
+      <class ref="0x8087040"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80b9c80">
-	  <geom ref="0x80b9b00"/>
+	<provider id="0x80b8e00">
+	  <geom ref="0x80b8c80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
-    <geom id="0x80b9000">
-      <class ref="0x80729c0"/>
+    <geom id="0x80b8180">
+      <class ref="0x8087040"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider id="0x80b9080">
-	  <geom ref="0x80b9000"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 675034a..1098f4c 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,175 +1,177 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8080720">
+  <class id="0x8087420">
     <name>DEV-class</name>
-    <geom id="0x80b8e80">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1e80">
+      <class ref="0x8087420"/>
       <name>da2c</name>
       <rank>3</rank>
-	<consumer id="0x80b0b40">
-	  <geom ref="0x80b8e80"/>
-	  <provider ref="0x80b8000"/>
+	<consumer id="0x80b9b40">
+	  <geom ref="0x80c1e80"/>
+	  <provider ref="0x80c1000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8d00">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1d00">
+      <class ref="0x8087420"/>
       <name>da2b</name>
       <rank>3</rank>
-	<consumer id="0x80b0b00">
-	  <geom ref="0x80b8d00"/>
-	  <provider ref="0x80aff80"/>
+	<consumer id="0x80b9b00">
+	  <geom ref="0x80c1d00"/>
+	  <provider ref="0x80b8f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8b80">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1b80">
+      <class ref="0x8087420"/>
       <name>da2a</name>
       <rank>3</rank>
-	<consumer id="0x80b0a00">
-	  <geom ref="0x80b8b80"/>
-	  <provider ref="0x80aff00"/>
+	<consumer id="0x80b9a00">
+	  <geom ref="0x80c1b80"/>
+	  <provider ref="0x80b8f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8a00">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1a00">
+      <class ref="0x8087420"/>
       <name>da1f</name>
       <rank>3</rank>
-	<consumer id="0x80b09c0">
-	  <geom ref="0x80b8a00"/>
-	  <provider ref="0x80afc80"/>
+	<consumer id="0x80b99c0">
+	  <geom ref="0x80c1a00"/>
+	  <provider ref="0x80b8c80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8880">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1880">
+      <class ref="0x8087420"/>
       <name>da1e</name>
       <rank>3</rank>
-	<consumer id="0x80b0980">
-	  <geom ref="0x80b8880"/>
-	  <provider ref="0x80afc00"/>
+	<consumer id="0x80b9980">
+	  <geom ref="0x80c1880"/>
+	  <provider ref="0x80b8c00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8700">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1700">
+      <class ref="0x8087420"/>
       <name>da1c</name>
       <rank>3</rank>
-	<consumer id="0x80b0940">
-	  <geom ref="0x80b8700"/>
-	  <provider ref="0x80afb80"/>
+	<consumer id="0x80b9940">
+	  <geom ref="0x80c1700"/>
+	  <provider ref="0x80b8b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8580">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1580">
+      <class ref="0x8087420"/>
       <name>da1b</name>
       <rank>3</rank>
-	<consumer id="0x80b0900">
-	  <geom ref="0x80b8580"/>
-	  <provider ref="0x80afb00"/>
+	<consumer id="0x80b9900">
+	  <geom ref="0x80c1580"/>
+	  <provider ref="0x80b8b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8400">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1400">
+      <class ref="0x8087420"/>
       <name>da1a</name>
       <rank>3</rank>
-	<consumer id="0x80b0800">
-	  <geom ref="0x80b8400"/>
-	  <provider ref="0x80afa80"/>
+	<consumer id="0x80b9800">
+	  <geom ref="0x80c1400"/>
+	  <provider ref="0x80b8a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8280">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1280">
+      <class ref="0x8087420"/>
       <name>da0c</name>
       <rank>3</rank>
-	<consumer id="0x80b07c0">
-	  <geom ref="0x80b8280"/>
-	  <provider ref="0x80af800"/>
+	<consumer id="0x80b97c0">
+	  <geom ref="0x80c1280"/>
+	  <provider ref="0x80b8800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8100">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1100">
+      <class ref="0x8087420"/>
       <name>da0b</name>
       <rank>3</rank>
-	<consumer id="0x80b0780">
-	  <geom ref="0x80b8100"/>
-	  <provider ref="0x80af780"/>
+	<consumer id="0x80b9780">
+	  <geom ref="0x80c1100"/>
+	  <provider ref="0x80b8780"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80b8080">
-      <class ref="0x8080720"/>
+    <geom id="0x80c1080">
+      <class ref="0x8087420"/>
       <name>da0a</name>
       <rank>3</rank>
-	<consumer id="0x80b0640">
-	  <geom ref="0x80b8080"/>
-	  <provider ref="0x80af700"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80c1080"/>
+	  <provider ref="0x80b8700"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80afd00">
-      <class ref="0x8080720"/>
+    <geom id="0x80b8d00">
+      <class ref="0x8087420"/>
       <name>da2</name>
       <rank>2</rank>
-	<consumer id="0x80b05c0">
-	  <geom ref="0x80afd00"/>
-	  <provider ref="0x80af400"/>
+	<consumer id="0x80b95c0">
+	  <geom ref="0x80b8d00"/>
+	  <provider ref="0x80b8400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80af880">
-      <class ref="0x8080720"/>
+    <geom id="0x80b8880">
+      <class ref="0x8087420"/>
       <name>da1</name>
       <rank>2</rank>
-	<consumer id="0x80b0540">
-	  <geom ref="0x80af880"/>
-	  <provider ref="0x80af300"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8880"/>
+	  <provider ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80af480">
-      <class ref="0x8080720"/>
+    <geom id="0x80b8480">
+      <class ref="0x8087420"/>
       <name>da0</name>
       <rank>2</rank>
-	<consumer id="0x80b0680">
-	  <geom ref="0x80af480"/>
-	  <provider ref="0x80af200"/>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80b8480"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x8080700">
+  <class id="0x8087400">
     <name>MBREXT</name>
   </class>
-  <class id="0x80806e0">
+  <class id="0x80873e0">
     <name>MBR</name>
   </class>
-  <class id="0x8080740">
+  <class id="0x8087440">
     <name>BSD</name>
-    <geom id="0x80afd80">
-      <class ref="0x8080740"/>
+    <geom id="0x80b8d80">
+      <class ref="0x8087440"/>
       <name>da2</name>
       <rank>2</rank>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b0ac0">
-	  <geom ref="0x80afd80"/>
-	  <provider ref="0x80af400"/>
+	<consumer id="0x80b9ac0">
+	  <geom ref="0x80b8d80"/>
+	  <provider ref="0x80b8400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80b8000">
-	  <geom ref="0x80afd80"/>
+	<provider id="0x80c1000">
+	  <geom ref="0x80b8d80"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2c</name>
+	  <mediasize>74027520</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>74027520</length>
@@ -178,10 +180,12 @@
 	    <secoffset>8225280</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80aff80">
-	  <geom ref="0x80afd80"/>
+	<provider id="0x80b8f80">
+	  <geom ref="0x80b8d80"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2b</name>
+	  <mediasize>4178442240</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>4178442240</length>
@@ -190,10 +194,12 @@
 	    <secoffset>64260</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80aff00">
-	  <geom ref="0x80afd80"/>
+	<provider id="0x80b8f00">
+	  <geom ref="0x80b8d80"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2a</name>
+	  <mediasize>24675840</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>24675840</length>
@@ -203,25 +209,27 @@
 	  </config>
 	</provider>
     </geom>
-    <geom id="0x80af900">
-      <class ref="0x8080740"/>
+    <geom id="0x80b8900">
+      <class ref="0x8087440"/>
       <name>da1</name>
       <rank>2</rank>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b08c0">
-	  <geom ref="0x80af900"/>
-	  <provider ref="0x80af300"/>
+	<consumer id="0x80b98c0">
+	  <geom ref="0x80b8900"/>
+	  <provider ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80afc80">
-	  <geom ref="0x80af900"/>
+	<provider id="0x80b8c80">
+	  <geom ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1f</name>
+	  <mediasize>16951073792</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>16951073792</length>
@@ -230,10 +238,12 @@
 	    <secoffset>2654144</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80afc00">
-	  <geom ref="0x80af900"/>
+	<provider id="0x80b8c00">
+	  <geom ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1e</name>
+	  <mediasize>20971520</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>4</index>
 	    <length>20971520</length>
@@ -242,10 +252,12 @@
 	    <secoffset>2613184</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80afb80">
-	  <geom ref="0x80af900"/>
+	<provider id="0x80b8b80">
+	  <geom ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1c</name>
+	  <mediasize>18309995520</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>18309995520</length>
@@ -254,10 +266,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80afb00">
-	  <geom ref="0x80af900"/>
+	<provider id="0x80b8b00">
+	  <geom ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1b</name>
+	  <mediasize>1086291968</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>1086291968</length>
@@ -266,10 +280,12 @@
 	    <secoffset>491520</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80afa80">
-	  <geom ref="0x80af900"/>
+	<provider id="0x80b8a80">
+	  <geom ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1a</name>
+	  <mediasize>251658240</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>251658240</length>
@@ -279,25 +295,27 @@
 	  </config>
 	</provider>
     </geom>
-    <geom id="0x80af500">
-      <class ref="0x8080740"/>
+    <geom id="0x80b8500">
+      <class ref="0x8087440"/>
       <name>da0</name>
       <rank>2</rank>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b0740">
-	  <geom ref="0x80af500"/>
-	  <provider ref="0x80af200"/>
+	<consumer id="0x80b9740">
+	  <geom ref="0x80b8500"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80af800">
-	  <geom ref="0x80af500"/>
+	<provider id="0x80b8800">
+	  <geom ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0c</name>
+	  <mediasize>4335206400</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>4335206400</length>
@@ -306,10 +324,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af780">
-	  <geom ref="0x80af500"/>
+	<provider id="0x80b8780">
+	  <geom ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0b</name>
+	  <mediasize>270925824</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>270925824</length>
@@ -318,10 +338,12 @@
 	    <secoffset>7938048</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af700">
-	  <geom ref="0x80af500"/>
+	<provider id="0x80b8700">
+	  <geom ref="0x80b8500"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0a</name>
+	  <mediasize>4064280576</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>4064280576</length>
@@ -332,36 +354,42 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8080640">
+  <class id="0x8087340">
     <name>SIMDISK-class</name>
-    <geom id="0x80af380">
-      <class ref="0x8080640"/>
+    <geom id="0x80b8380">
+      <class ref="0x8087340"/>
       <name>da2</name>
       <rank>1</rank>
-	<provider id="0x80af400">
-	  <geom ref="0x80af380"/>
+	<provider id="0x80b8400">
+	  <geom ref="0x80b8380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
-    <geom id="0x80af280">
-      <class ref="0x8080640"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087340"/>
       <name>da1</name>
       <rank>1</rank>
-	<provider id="0x80af300">
-	  <geom ref="0x80af280"/>
+	<provider id="0x80b8300">
+	  <geom ref="0x80b8280"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
-    <geom id="0x80af180">
-      <class ref="0x8080640"/>
+    <geom id="0x80b8180">
+      <class ref="0x8087340"/>
       <name>da0</name>
       <rank>1</rank>
-	<provider id="0x80af200">
-	  <geom ref="0x80af180"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>
diff --git a/tools/regression/geom/Test/T014/ref.conf b/tools/regression/geom/Test/T014/ref.conf
index 168a3ef..119e680 100644
--- a/tools/regression/geom/Test/T014/ref.conf
+++ b/tools/regression/geom/Test/T014/ref.conf
@@ -1,98 +1,100 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x8081340">
+  <class id="0x8087140">
     <name>DEV-class</name>
-    <geom id="0x80aff80">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8f80">
+      <class ref="0x8087140"/>
       <name>wd0s1f</name>
       <rank>4</rank>
-	<consumer id="0x80b0900">
-	  <geom ref="0x80aff80"/>
-	  <provider ref="0x80afa00"/>
+	<consumer id="0x80b9900">
+	  <geom ref="0x80b8f80"/>
+	  <provider ref="0x80b8a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80afe00">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8e00">
+      <class ref="0x8087140"/>
       <name>wd0s1e</name>
       <rank>4</rank>
-	<consumer id="0x80b08c0">
-	  <geom ref="0x80afe00"/>
-	  <provider ref="0x80af980"/>
+	<consumer id="0x80b98c0">
+	  <geom ref="0x80b8e00"/>
+	  <provider ref="0x80b8980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80afc80">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8c80">
+      <class ref="0x8087140"/>
       <name>wd0s1c</name>
       <rank>4</rank>
-	<consumer id="0x80b0880">
-	  <geom ref="0x80afc80"/>
-	  <provider ref="0x80af900"/>
+	<consumer id="0x80b9880">
+	  <geom ref="0x80b8c80"/>
+	  <provider ref="0x80b8900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80afb00">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8b00">
+      <class ref="0x8087140"/>
       <name>wd0s1b</name>
       <rank>4</rank>
-	<consumer id="0x80b0840">
-	  <geom ref="0x80afb00"/>
-	  <provider ref="0x80af880"/>
+	<consumer id="0x80b9840">
+	  <geom ref="0x80b8b00"/>
+	  <provider ref="0x80b8880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80afa80">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8a80">
+      <class ref="0x8087140"/>
       <name>wd0s1a</name>
       <rank>4</rank>
-	<consumer id="0x80b0640">
-	  <geom ref="0x80afa80"/>
-	  <provider ref="0x80af800"/>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80b8a80"/>
+	  <provider ref="0x80b8800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80af480">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8480">
+      <class ref="0x8087140"/>
       <name>wd0s1</name>
       <rank>3</rank>
-	<consumer id="0x80b0540">
-	  <geom ref="0x80af480"/>
-	  <provider ref="0x80af400"/>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80b8480"/>
+	  <provider ref="0x80b8400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom id="0x80af280">
-      <class ref="0x8081340"/>
+    <geom id="0x80b8280">
+      <class ref="0x8087140"/>
       <name>wd0</name>
       <rank>2</rank>
-	<consumer id="0x80b0580">
-	  <geom ref="0x80af280"/>
-	  <provider ref="0x80af200"/>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80b8280"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class id="0x8081220">
+  <class id="0x8087020">
     <name>PC98</name>
-    <geom id="0x80af300">
-      <class ref="0x8081220"/>
+    <geom id="0x80b8300">
+      <class ref="0x8087020"/>
       <name>wd0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8704</frontstuff>
       </config>
-	<consumer id="0x80b0600">
-	  <geom ref="0x80af300"/>
-	  <provider ref="0x80af200"/>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80b8300"/>
+	  <provider ref="0x80b8200"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80af400">
-	  <geom ref="0x80af300"/>
+	<provider id="0x80b8400">
+	  <geom ref="0x80b8300"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1</name>
+	  <mediasize>1626603520</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>1626603520</length>
@@ -103,36 +105,38 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8081240">
+  <class id="0x8087040">
     <name>SUN</name>
   </class>
-  <class id="0x8081320">
+  <class id="0x8087120">
     <name>MBREXT</name>
   </class>
-  <class id="0x8081300">
+  <class id="0x8087100">
     <name>MBR</name>
   </class>
-  <class id="0x8081360">
+  <class id="0x8087160">
     <name>BSD</name>
-    <geom id="0x80af600">
-      <class ref="0x8081360"/>
+    <geom id="0x80b8600">
+      <class ref="0x8087160"/>
       <name>wd0s1</name>
       <rank>3</rank>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer id="0x80b0800">
-	  <geom ref="0x80af600"/>
-	  <provider ref="0x80af400"/>
+	<consumer id="0x80b9800">
+	  <geom ref="0x80b8600"/>
+	  <provider ref="0x80b8400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
-	<provider id="0x80afa00">
-	  <geom ref="0x80af600"/>
+	<provider id="0x80b8a00">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1f</name>
+	  <mediasize>1390673920</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>5</index>
 	    <length>1390673920</length>
@@ -141,10 +145,12 @@
 	    <secoffset>460800</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af980">
-	  <geom ref="0x80af600"/>
+	<provider id="0x80b8980">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1e</name>
+	  <mediasize>52428800</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>4</index>
 	    <length>52428800</length>
@@ -153,10 +159,12 @@
 	    <secoffset>358400</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af900">
-	  <geom ref="0x80af600"/>
+	<provider id="0x80b8900">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1c</name>
+	  <mediasize>1626603520</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>2</index>
 	    <length>1626603520</length>
@@ -165,10 +173,12 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af880">
-	  <geom ref="0x80af600"/>
+	<provider id="0x80b8880">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1b</name>
+	  <mediasize>104857600</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>1</index>
 	    <length>104857600</length>
@@ -177,10 +187,12 @@
 	    <secoffset>153600</secoffset>
 	  </config>
 	</provider>
-	<provider id="0x80af800">
-	  <geom ref="0x80af600"/>
+	<provider id="0x80b8800">
+	  <geom ref="0x80b8600"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1a</name>
+	  <mediasize>78643200</mediasize>
+	  <sectorsize>512</sectorsize>
 	  <config>
 	    <index>0</index>
 	    <length>78643200</length>
@@ -191,16 +203,18 @@
 	</provider>
     </geom>
   </class>
-  <class id="0x8081260">
+  <class id="0x8087060">
     <name>SIMDISK-class</name>
-    <geom id="0x80af180">
-      <class ref="0x8081260"/>
+    <geom id="0x80b8180">
+      <class ref="0x8087060"/>
       <name>wd0</name>
       <rank>1</rank>
-	<provider id="0x80af200">
-	  <geom ref="0x80af180"/>
+	<provider id="0x80b8200">
+	  <geom ref="0x80b8180"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0</name>
+	  <mediasize>1099511627776</mediasize>
+	  <sectorsize>512</sectorsize>
 	</provider>
     </geom>
   </class>