Index: head/tools/regression/geom/Test/T001/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T001/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T001/ref.conf	(revision 103010)
@@ -1,458 +1,368 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072400">
     <name>DEV-class</name>
     <geom id="0x80bfe80">
       <class ref="0x8072400"/>
       <name>ad0s3d</name>
       <rank>4</rank>
 	<consumer id="0x80b8440">
 	  <geom ref="0x80bfe80"/>
 	  <provider ref="0x80bf300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bfd00">
       <class ref="0x8072400"/>
       <name>ad0s3c</name>
       <rank>4</rank>
 	<consumer id="0x80b8400">
 	  <geom ref="0x80bfd00"/>
 	  <provider ref="0x80bf280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bfb80">
       <class ref="0x8072400"/>
       <name>ad0s3a</name>
       <rank>4</rank>
 	<consumer id="0x80b83c0">
 	  <geom ref="0x80bfb80"/>
 	  <provider ref="0x80bf200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bfa00">
       <class ref="0x8072400"/>
       <name>ad0s2c</name>
       <rank>4</rank>
 	<consumer id="0x80b8380">
 	  <geom ref="0x80bfa00"/>
 	  <provider ref="0x80bce80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bf880">
       <class ref="0x8072400"/>
       <name>ad0s1f</name>
       <rank>4</rank>
 	<consumer id="0x80b8340">
 	  <geom ref="0x80bf880"/>
 	  <provider ref="0x80bcb00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bf700">
       <class ref="0x8072400"/>
       <name>ad0s1e</name>
       <rank>4</rank>
 	<consumer id="0x80b8300">
 	  <geom ref="0x80bf700"/>
 	  <provider ref="0x80bca80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bf580">
       <class ref="0x8072400"/>
       <name>ad0s1c</name>
       <rank>4</rank>
 	<consumer id="0x80b82c0">
 	  <geom ref="0x80bf580"/>
 	  <provider ref="0x80bca00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bf400">
       <class ref="0x8072400"/>
       <name>ad0s1b</name>
       <rank>4</rank>
 	<consumer id="0x80b8280">
 	  <geom ref="0x80bf400"/>
 	  <provider ref="0x80bc980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bf380">
       <class ref="0x8072400"/>
       <name>ad0s1a</name>
       <rank>4</rank>
 	<consumer id="0x80b8240">
 	  <geom ref="0x80bf380"/>
 	  <provider ref="0x80bc900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcf00">
       <class ref="0x8072400"/>
       <name>ad0s3</name>
       <rank>3</rank>
 	<consumer id="0x80b81c0">
 	  <geom ref="0x80bcf00"/>
 	  <provider ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcb80">
       <class ref="0x8072400"/>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80bcb80"/>
 	  <provider ref="0x80bc400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc580">
       <class ref="0x8072400"/>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80bc580"/>
 	  <provider ref="0x80bc380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc100">
       <class ref="0x8072400"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80bc100"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x80723e0">
     <name>MBREXT</name>
   </class>
   <class id="0x80723c0">
     <name>MBR</name>
     <geom id="0x80bc180">
       <class ref="0x80723c0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>boot</name>
-        <offset>0</offset>
-        <length>446</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>mbr</name>
-        <offset>446</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>magic</name>
-        <offset>510</offset>
-        <length>2</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80bc180"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bc480">
 	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3</name>
 	  <config>
 	    <index>2</index>
 	    <length>8585256960</length>
 	    <seclength>16768080</seclength>
 	    <offset>8585256960</offset>
 	    <secoffset>16768080</secoffset>
 	    <type>165</type>
 	  </config>
 	</provider>
 	<provider id="0x80bc400">
 	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
 	    <index>1</index>
 	    <length>5364817920</length>
 	    <seclength>10478160</seclength>
 	    <offset>3220439040</offset>
 	    <secoffset>6289920</secoffset>
 	    <type>165</type>
 	  </config>
 	</provider>
 	<provider id="0x80bc380">
 	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
 	    <index>0</index>
 	    <length>3220406784</length>
 	    <seclength>6289857</seclength>
 	    <offset>32256</offset>
 	    <secoffset>63</secoffset>
 	    <type>165</type>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072420">
     <name>BSD</name>
     <geom id="0x80bcf80">
       <class ref="0x8072420"/>
       <name>ad0s3</name>
       <rank>3</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8200">
 	  <geom ref="0x80bcf80"/>
 	  <provider ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bf300">
 	  <geom ref="0x80bcf80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3d</name>
 	  <config>
 	    <index>3</index>
 	    <length>6488104960</length>
 	    <seclength>12672080</seclength>
 	    <offset>2097152000</offset>
 	    <secoffset>4096000</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bf280">
 	  <geom ref="0x80bcf80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3c</name>
 	  <config>
 	    <index>2</index>
 	    <length>8585256960</length>
 	    <seclength>16768080</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bf200">
 	  <geom ref="0x80bcf80"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3a</name>
 	  <config>
 	    <index>0</index>
 	    <length>2097152000</length>
 	    <seclength>4096000</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
     <geom id="0x80bcc00">
       <class ref="0x8072420"/>
       <name>ad0s2</name>
       <rank>3</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8180">
 	  <geom ref="0x80bcc00"/>
 	  <provider ref="0x80bc400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bce80">
 	  <geom ref="0x80bcc00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2c</name>
 	  <config>
 	    <index>2</index>
 	    <length>5364817920</length>
 	    <seclength>10478160</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
     <geom id="0x80bc600">
       <class ref="0x8072420"/>
       <name>ad0s1</name>
       <rank>3</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80bc600"/>
 	  <provider ref="0x80bc380"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bcb00">
 	  <geom ref="0x80bc600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
 	  <config>
 	    <index>5</index>
 	    <length>2066973184</length>
 	    <seclength>4037057</seclength>
 	    <offset>1153433600</offset>
 	    <secoffset>2252800</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bca80">
 	  <geom ref="0x80bc600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
 	  <config>
 	    <index>4</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
 	    <offset>629145600</offset>
 	    <secoffset>1228800</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bca00">
 	  <geom ref="0x80bc600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
 	  <config>
 	    <index>2</index>
 	    <length>3220406784</length>
 	    <seclength>6289857</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc980">
 	  <geom ref="0x80bc600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
 	  <config>
 	    <index>1</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
 	    <offset>104857600</offset>
 	    <secoffset>204800</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc900">
 	  <geom ref="0x80bc600"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
 	  <config>
 	    <index>0</index>
 	    <length>104857600</length>
 	    <seclength>204800</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072320">
     <name>SIMDISK-class</name>
     <geom id="0x80bc000">
       <class ref="0x8072320"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80bc080">
 	  <geom ref="0x80bc000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T002/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T002/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T002/ref.conf	(revision 103010)
@@ -1,117 +1,99 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072400">
     <name>DEV-class</name>
     <geom id="0x80b9580">
       <class ref="0x8072400"/>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80b9580"/>
 	  <provider ref="0x80b9400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9500">
       <class ref="0x8072400"/>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80b9500"/>
 	  <provider ref="0x80b9380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9100">
       <class ref="0x8072400"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80b9100"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x80723e0">
     <name>MBREXT</name>
   </class>
   <class id="0x80723c0">
     <name>MBR</name>
     <geom id="0x80b9180">
       <class ref="0x80723c0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>boot</name>
-        <offset>0</offset>
-        <length>446</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>mbr</name>
-        <offset>446</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>magic</name>
-        <offset>510</offset>
-        <length>2</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80b9180"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80b9400">
 	  <geom ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
 	    <index>1</index>
 	    <length>4564740096</length>
 	    <seclength>8915508</seclength>
 	    <offset>296884224</offset>
 	    <secoffset>579852</secoffset>
 	    <type>11</type>
 	  </config>
 	</provider>
 	<provider id="0x80b9380">
 	  <geom ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
 	    <index>0</index>
 	    <length>296821760</length>
 	    <seclength>579730</seclength>
 	    <offset>32256</offset>
 	    <secoffset>63</secoffset>
 	    <type>160</type>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072420">
     <name>BSD</name>
   </class>
   <class id="0x8072320">
     <name>SIMDISK-class</name>
     <geom id="0x80b9000">
       <class ref="0x8072320"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80b9080">
 	  <geom ref="0x80b9000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T003/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T003/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T003/ref.conf	(revision 103010)
@@ -1,661 +1,643 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072400">
     <name>DEV-class</name>
     <geom id="0x80ca580">
       <class ref="0x8072400"/>
       <name>ad0s27</name>
       <rank>4</rank>
 	<consumer id="0x80b8700">
 	  <geom ref="0x80ca580"/>
 	  <provider ref="0x80c3400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80ca400">
       <class ref="0x8072400"/>
       <name>ad0s26</name>
       <rank>4</rank>
 	<consumer id="0x80b86c0">
 	  <geom ref="0x80ca400"/>
 	  <provider ref="0x80c3380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80ca280">
       <class ref="0x8072400"/>
       <name>ad0s25</name>
       <rank>4</rank>
 	<consumer id="0x80b8680">
 	  <geom ref="0x80ca280"/>
 	  <provider ref="0x80c3300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80ca100">
       <class ref="0x8072400"/>
       <name>ad0s24</name>
       <rank>4</rank>
 	<consumer id="0x80b8640">
 	  <geom ref="0x80ca100"/>
 	  <provider ref="0x80c3280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5f80">
       <class ref="0x8072400"/>
       <name>ad0s23</name>
       <rank>4</rank>
 	<consumer id="0x80b8600">
 	  <geom ref="0x80c5f80"/>
 	  <provider ref="0x80c3200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5e00">
       <class ref="0x8072400"/>
       <name>ad0s22</name>
       <rank>4</rank>
 	<consumer id="0x80b85c0">
 	  <geom ref="0x80c5e00"/>
 	  <provider ref="0x80c3180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5c80">
       <class ref="0x8072400"/>
       <name>ad0s21</name>
       <rank>4</rank>
 	<consumer id="0x80b8580">
 	  <geom ref="0x80c5c80"/>
 	  <provider ref="0x80c3100"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5b00">
       <class ref="0x8072400"/>
       <name>ad0s20</name>
       <rank>4</rank>
 	<consumer id="0x80b8540">
 	  <geom ref="0x80c5b00"/>
 	  <provider ref="0x80c3080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5980">
       <class ref="0x8072400"/>
       <name>ad0s19</name>
       <rank>4</rank>
 	<consumer id="0x80b8500">
 	  <geom ref="0x80c5980"/>
 	  <provider ref="0x80c3000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5800">
       <class ref="0x8072400"/>
       <name>ad0s18</name>
       <rank>4</rank>
 	<consumer id="0x80b84c0">
 	  <geom ref="0x80c5800"/>
 	  <provider ref="0x80c0f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5680">
       <class ref="0x8072400"/>
       <name>ad0s17</name>
       <rank>4</rank>
 	<consumer id="0x80b8480">
 	  <geom ref="0x80c5680"/>
 	  <provider ref="0x80c0f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5500">
       <class ref="0x8072400"/>
       <name>ad0s16</name>
       <rank>4</rank>
 	<consumer id="0x80b8440">
 	  <geom ref="0x80c5500"/>
 	  <provider ref="0x80c0e80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5380">
       <class ref="0x8072400"/>
       <name>ad0s15</name>
       <rank>4</rank>
 	<consumer id="0x80b8400">
 	  <geom ref="0x80c5380"/>
 	  <provider ref="0x80c0e00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5200">
       <class ref="0x8072400"/>
       <name>ad0s14</name>
       <rank>4</rank>
 	<consumer id="0x80b83c0">
 	  <geom ref="0x80c5200"/>
 	  <provider ref="0x80c0d80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c5080">
       <class ref="0x8072400"/>
       <name>ad0s13</name>
       <rank>4</rank>
 	<consumer id="0x80b8380">
 	  <geom ref="0x80c5080"/>
 	  <provider ref="0x80c0d00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3f00">
       <class ref="0x8072400"/>
       <name>ad0s12</name>
       <rank>4</rank>
 	<consumer id="0x80b8340">
 	  <geom ref="0x80c3f00"/>
 	  <provider ref="0x80c0c80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3d80">
       <class ref="0x8072400"/>
       <name>ad0s11</name>
       <rank>4</rank>
 	<consumer id="0x80b8300">
 	  <geom ref="0x80c3d80"/>
 	  <provider ref="0x80c0c00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3c00">
       <class ref="0x8072400"/>
       <name>ad0s10</name>
       <rank>4</rank>
 	<consumer id="0x80b82c0">
 	  <geom ref="0x80c3c00"/>
 	  <provider ref="0x80c0b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3a80">
       <class ref="0x8072400"/>
       <name>ad0s9</name>
       <rank>4</rank>
 	<consumer id="0x80b8280">
 	  <geom ref="0x80c3a80"/>
 	  <provider ref="0x80c0b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3900">
       <class ref="0x8072400"/>
       <name>ad0s8</name>
       <rank>4</rank>
 	<consumer id="0x80b8240">
 	  <geom ref="0x80c3900"/>
 	  <provider ref="0x80c0a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3780">
       <class ref="0x8072400"/>
       <name>ad0s7</name>
       <rank>4</rank>
 	<consumer id="0x80b8200">
 	  <geom ref="0x80c3780"/>
 	  <provider ref="0x80c0a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3600">
       <class ref="0x8072400"/>
       <name>ad0s6</name>
       <rank>4</rank>
 	<consumer id="0x80b81c0">
 	  <geom ref="0x80c3600"/>
 	  <provider ref="0x80c0980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c3480">
       <class ref="0x8072400"/>
       <name>ad0s5</name>
       <rank>4</rank>
 	<consumer id="0x80b8180">
 	  <geom ref="0x80c3480"/>
 	  <provider ref="0x80c0900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c0580">
       <class ref="0x8072400"/>
       <name>ad0s2</name>
       <rank>3</rank>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80c0580"/>
 	  <provider ref="0x80c0400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c0500">
       <class ref="0x8072400"/>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80c0500"/>
 	  <provider ref="0x80c0380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c0100">
       <class ref="0x8072400"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80c0100"/>
 	  <provider ref="0x80c0080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x80723e0">
     <name>MBREXT</name>
     <geom id="0x80c0780">
       <class ref="0x80723e0"/>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80c0780"/>
 	  <provider ref="0x80c0400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80c3400">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s27</name>
 	  <config>
 	    <index>22</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>180988416</offset>
 	    <secoffset>353493</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3380">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s26</name>
 	  <config>
 	    <index>21</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>172763136</offset>
 	    <secoffset>337428</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3300">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s25</name>
 	  <config>
 	    <index>20</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>164537856</offset>
 	    <secoffset>321363</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3280">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s24</name>
 	  <config>
 	    <index>19</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>156312576</offset>
 	    <secoffset>305298</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3200">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s23</name>
 	  <config>
 	    <index>18</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>148087296</offset>
 	    <secoffset>289233</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3180">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s22</name>
 	  <config>
 	    <index>17</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>139862016</offset>
 	    <secoffset>273168</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3100">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s21</name>
 	  <config>
 	    <index>16</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>131636736</offset>
 	    <secoffset>257103</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3080">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s20</name>
 	  <config>
 	    <index>15</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>123411456</offset>
 	    <secoffset>241038</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c3000">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s19</name>
 	  <config>
 	    <index>14</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>115186176</offset>
 	    <secoffset>224973</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0f80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s18</name>
 	  <config>
 	    <index>13</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>106960896</offset>
 	    <secoffset>208908</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0f00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s17</name>
 	  <config>
 	    <index>12</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>98735616</offset>
 	    <secoffset>192843</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0e80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s16</name>
 	  <config>
 	    <index>11</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>90510336</offset>
 	    <secoffset>176778</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0e00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s15</name>
 	  <config>
 	    <index>10</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>82285056</offset>
 	    <secoffset>160713</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0d80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s14</name>
 	  <config>
 	    <index>9</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>74059776</offset>
 	    <secoffset>144648</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0d00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s13</name>
 	  <config>
 	    <index>8</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>65834496</offset>
 	    <secoffset>128583</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0c80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s12</name>
 	  <config>
 	    <index>7</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>57609216</offset>
 	    <secoffset>112518</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0c00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s11</name>
 	  <config>
 	    <index>6</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>49383936</offset>
 	    <secoffset>96453</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0b80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s10</name>
 	  <config>
 	    <index>5</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>41158656</offset>
 	    <secoffset>80388</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0b00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s9</name>
 	  <config>
 	    <index>4</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>32933376</offset>
 	    <secoffset>64323</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0a80">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s8</name>
 	  <config>
 	    <index>3</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>24708096</offset>
 	    <secoffset>48258</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0a00">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s7</name>
 	  <config>
 	    <index>2</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>16482816</offset>
 	    <secoffset>32193</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0980">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s6</name>
 	  <config>
 	    <index>1</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>8257536</offset>
 	    <secoffset>16128</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0900">
 	  <geom ref="0x80c0780"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s5</name>
 	  <config>
 	    <index>0</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
 	    <offset>32256</offset>
 	    <secoffset>63</secoffset>
 	    <type>1</type>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x80723c0">
     <name>MBR</name>
     <geom id="0x80c0180">
       <class ref="0x80723c0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>boot</name>
-        <offset>0</offset>
-        <length>446</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>mbr</name>
-        <offset>446</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>magic</name>
-        <offset>510</offset>
-        <length>2</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80c0180"/>
 	  <provider ref="0x80c0080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80c0400">
 	  <geom ref="0x80c0180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
 	    <index>1</index>
 	    <length>427714560</length>
 	    <seclength>835380</seclength>
 	    <offset>2146798080</offset>
 	    <secoffset>4192965</secoffset>
 	    <type>5</type>
 	  </config>
 	</provider>
 	<provider id="0x80c0380">
 	  <geom ref="0x80c0180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
 	    <index>0</index>
 	    <length>2146765824</length>
 	    <seclength>4192902</seclength>
 	    <offset>32256</offset>
 	    <secoffset>63</secoffset>
 	    <type>6</type>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072420">
     <name>BSD</name>
   </class>
   <class id="0x8072320">
     <name>SIMDISK-class</name>
     <geom id="0x80c0000">
       <class ref="0x8072320"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80c0080">
 	  <geom ref="0x80c0000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T004/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T004/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T004/ref.conf	(revision 103010)
@@ -1,310 +1,268 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072420">
     <name>DEV-class</name>
     <geom id="0x80be580">
       <class ref="0x8072420"/>
       <name>ad0s1h</name>
       <rank>4</rank>
 	<consumer id="0x80b8300">
 	  <geom ref="0x80be580"/>
 	  <provider ref="0x80bcb80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be400">
       <class ref="0x8072420"/>
       <name>ad0s1g</name>
       <rank>4</rank>
 	<consumer id="0x80b82c0">
 	  <geom ref="0x80be400"/>
 	  <provider ref="0x80bcb00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be280">
       <class ref="0x8072420"/>
       <name>ad0s1f</name>
       <rank>4</rank>
 	<consumer id="0x80b8280">
 	  <geom ref="0x80be280"/>
 	  <provider ref="0x80bca80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be100">
       <class ref="0x8072420"/>
       <name>ad0s1e</name>
       <rank>4</rank>
 	<consumer id="0x80b8240">
 	  <geom ref="0x80be100"/>
 	  <provider ref="0x80bca00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcf80">
       <class ref="0x8072420"/>
       <name>ad0s1d</name>
       <rank>4</rank>
 	<consumer id="0x80b8200">
 	  <geom ref="0x80bcf80"/>
 	  <provider ref="0x80bc980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bce00">
       <class ref="0x8072420"/>
       <name>ad0s1c</name>
       <rank>4</rank>
 	<consumer id="0x80b81c0">
 	  <geom ref="0x80bce00"/>
 	  <provider ref="0x80bc900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcc80">
       <class ref="0x8072420"/>
       <name>ad0s1b</name>
       <rank>4</rank>
 	<consumer id="0x80b8180">
 	  <geom ref="0x80bcc80"/>
 	  <provider ref="0x80bc880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcc00">
       <class ref="0x8072420"/>
       <name>ad0s1a</name>
       <rank>4</rank>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80bcc00"/>
 	  <provider ref="0x80bc800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc480">
       <class ref="0x8072420"/>
       <name>ad0s1</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80bc480"/>
 	  <provider ref="0x80bc380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc100">
       <class ref="0x8072420"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80bc100"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x8072400">
     <name>MBREXT</name>
   </class>
   <class id="0x80723e0">
     <name>MBR</name>
     <geom id="0x80bc180">
       <class ref="0x80723e0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>boot</name>
-        <offset>0</offset>
-        <length>446</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>mbr</name>
-        <offset>446</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>magic</name>
-        <offset>510</offset>
-        <length>2</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80bc180"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bc380">
 	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
 	    <index>0</index>
 	    <length>20003848704</length>
 	    <seclength>39070017</seclength>
 	    <offset>32256</offset>
 	    <secoffset>63</secoffset>
 	    <type>165</type>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072440">
     <name>BSD</name>
     <geom id="0x80bc500">
       <class ref="0x8072440"/>
       <name>ad0s1</name>
       <rank>3</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80bc500"/>
 	  <provider ref="0x80bc380"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bcb80">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1h</name>
 	  <config>
 	    <index>7</index>
 	    <length>5368709120</length>
 	    <seclength>10485760</seclength>
 	    <offset>10187964416</offset>
 	    <secoffset>19898368</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bcb00">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1g</name>
 	  <config>
 	    <index>6</index>
 	    <length>3221225472</length>
 	    <seclength>6291456</seclength>
 	    <offset>6966738944</offset>
 	    <secoffset>13606912</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bca80">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
 	  <config>
 	    <index>5</index>
 	    <length>4294967296</length>
 	    <seclength>8388608</seclength>
 	    <offset>2671771648</offset>
 	    <secoffset>5218304</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bca00">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
 	  <config>
 	    <index>4</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
 	    <offset>2147483648</offset>
 	    <secoffset>4194304</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc980">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1d</name>
 	  <config>
 	    <index>3</index>
 	    <length>4447175168</length>
 	    <seclength>8685889</seclength>
 	    <offset>15556673536</offset>
 	    <secoffset>30384128</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc900">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
 	  <config>
 	    <index>2</index>
 	    <length>20003848704</length>
 	    <seclength>39070017</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc880">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
 	  <config>
 	    <index>1</index>
 	    <length>1073741824</length>
 	    <seclength>2097152</seclength>
 	    <offset>1073741824</offset>
 	    <secoffset>2097152</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc800">
 	  <geom ref="0x80bc500"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
 	  <config>
 	    <index>0</index>
 	    <length>1073741824</length>
 	    <seclength>2097152</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072340">
     <name>SIMDISK-class</name>
     <geom id="0x80bc000">
       <class ref="0x8072340"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80bc080">
 	  <geom ref="0x80bc000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T005/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T005/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T005/ref.conf	(revision 103010)
@@ -1,144 +1,120 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072400">
     <name>DEV-class</name>
     <geom id="0x80b9780">
       <class ref="0x8072400"/>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80b9780"/>
 	  <provider ref="0x80b9500"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9600">
       <class ref="0x8072400"/>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80b9600"/>
 	  <provider ref="0x80b9480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9580">
       <class ref="0x8072400"/>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80b9580"/>
 	  <provider ref="0x80b9400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9100">
       <class ref="0x8072400"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80b9100"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x80723e0">
     <name>MBREXT</name>
   </class>
   <class id="0x80723c0">
     <name>MBR</name>
   </class>
   <class id="0x8072420">
     <name>BSD</name>
     <geom id="0x80b9180">
       <class ref="0x8072420"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80b9180"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80b9500">
 	  <geom ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
 	    <index>2</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9480">
 	  <geom ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
 	    <index>1</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9400">
 	  <geom ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
 	    <index>0</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072320">
     <name>SIMDISK-class</name>
     <geom id="0x80b9000">
       <class ref="0x8072320"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80b9080">
 	  <geom ref="0x80b9000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T012/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T012/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T012/ref.conf	(revision 103010)
@@ -1,345 +1,333 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x80729a0">
     <name>SUN</name>
     <geom id="0x80b9d00">
       <class ref="0x80729a0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>label</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8200">
 	  <geom ref="0x80b9d00"/>
 	  <provider ref="0x80b9c80"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80c1080">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
 	  <config>
 	    <index>7</index>
 	    <length>1343787008</length>
 	    <seclength>2624584</seclength>
 	    <offset>5638115328</offset>
 	    <secoffset>11011944</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80c1000">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0g</name>
 	  <config>
 	    <index>6</index>
 	    <length>2149576704</length>
 	    <seclength>4198392</seclength>
 	    <offset>3488538624</offset>
 	    <secoffset>6813552</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9f80">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0f</name>
 	  <config>
 	    <index>5</index>
 	    <length>2149576704</length>
 	    <seclength>4198392</seclength>
 	    <offset>1338961920</offset>
 	    <secoffset>2615160</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9f00">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0d</name>
 	  <config>
 	    <index>3</index>
 	    <length>11124240384</length>
 	    <seclength>21727032</seclength>
 	    <offset>6981902336</offset>
 	    <secoffset>13636528</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9e80">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
 	    <index>2</index>
 	    <length>18108555264</length>
 	    <seclength>35368272</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9e00">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
 	    <index>1</index>
 	    <length>1075994624</length>
 	    <seclength>2101552</seclength>
 	    <offset>262967296</offset>
 	    <secoffset>513608</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9d80">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
 	    <index>0</index>
 	    <length>262967296</length>
 	    <seclength>513608</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
     <geom id="0x80b9100">
       <class ref="0x80729a0"/>
       <name>ad0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>label</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8040">
 	  <geom ref="0x80b9100"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80b9380">
 	  <geom ref="0x80b9100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
 	  <config>
 	    <index>7</index>
 	    <length>34629267456</length>
 	    <seclength>67635288</seclength>
 	    <offset>2069028864</offset>
 	    <secoffset>4041072</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9300">
 	  <geom ref="0x80b9100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
 	    <index>2</index>
 	    <length>36698296320</length>
 	    <seclength>71676360</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9280">
 	  <geom ref="0x80b9100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
 	    <index>1</index>
 	    <length>539320320</length>
 	    <seclength>1053360</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9200">
 	  <geom ref="0x80b9100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
 	    <index>0</index>
 	    <length>1529708544</length>
 	    <seclength>2987712</seclength>
 	    <offset>539320320</offset>
 	    <secoffset>1053360</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072aa0">
     <name>DEV-class</name>
     <geom id="0x80c1a80">
       <class ref="0x8072aa0"/>
       <name>ad0h</name>
       <rank>3</rank>
 	<consumer id="0x80b8400">
 	  <geom ref="0x80c1a80"/>
 	  <provider ref="0x80c1080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1900">
       <class ref="0x8072aa0"/>
       <name>ad0g</name>
       <rank>3</rank>
 	<consumer id="0x80b83c0">
 	  <geom ref="0x80c1900"/>
 	  <provider ref="0x80c1000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1780">
       <class ref="0x8072aa0"/>
       <name>ad0f</name>
       <rank>3</rank>
 	<consumer id="0x80b8380">
 	  <geom ref="0x80c1780"/>
 	  <provider ref="0x80b9f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1600">
       <class ref="0x8072aa0"/>
       <name>ad0d</name>
       <rank>3</rank>
 	<consumer id="0x80b8340">
 	  <geom ref="0x80c1600"/>
 	  <provider ref="0x80b9f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1480">
       <class ref="0x8072aa0"/>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer id="0x80b8300">
 	  <geom ref="0x80c1480"/>
 	  <provider ref="0x80b9e80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1300">
       <class ref="0x8072aa0"/>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer id="0x80b82c0">
 	  <geom ref="0x80c1300"/>
 	  <provider ref="0x80b9e00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1180">
       <class ref="0x8072aa0"/>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer id="0x80b8280">
 	  <geom ref="0x80c1180"/>
 	  <provider ref="0x80b9d80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80c1100">
       <class ref="0x8072aa0"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8240">
 	  <geom ref="0x80c1100"/>
 	  <provider ref="0x80b9c80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9980">
       <class ref="0x8072aa0"/>
       <name>ad0h</name>
       <rank>3</rank>
 	<consumer id="0x80b8180">
 	  <geom ref="0x80b9980"/>
 	  <provider ref="0x80b9380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9800">
       <class ref="0x8072aa0"/>
       <name>ad0c</name>
       <rank>3</rank>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80b9800"/>
 	  <provider ref="0x80b9300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9600">
       <class ref="0x8072aa0"/>
       <name>ad0b</name>
       <rank>3</rank>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80b9600"/>
 	  <provider ref="0x80b9280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9480">
       <class ref="0x8072aa0"/>
       <name>ad0a</name>
       <rank>3</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80b9480"/>
 	  <provider ref="0x80b9200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9400">
       <class ref="0x8072aa0"/>
       <name>ad0</name>
       <rank>2</rank>
 	<consumer id="0x80b8080">
 	  <geom ref="0x80b9400"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x8072a80">
     <name>MBREXT</name>
   </class>
   <class id="0x8072a60">
     <name>MBR</name>
   </class>
   <class id="0x8072ac0">
     <name>BSD</name>
   </class>
   <class id="0x80729c0">
     <name>SIMDISK-class</name>
     <geom id="0x80b9b00">
       <class ref="0x80729c0"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80b9c80">
 	  <geom ref="0x80b9b00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
     <geom id="0x80b9000">
       <class ref="0x80729c0"/>
       <name>ad0</name>
       <rank>1</rank>
 	<provider id="0x80b9080">
 	  <geom ref="0x80b9000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T013/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T013/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T013/ref.conf	(revision 103010)
@@ -1,422 +1,368 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x80724a0">
     <name>DEV-class</name>
     <geom id="0x80bee80">
       <class ref="0x80724a0"/>
       <name>da2c</name>
       <rank>3</rank>
 	<consumer id="0x80b84c0">
 	  <geom ref="0x80bee80"/>
 	  <provider ref="0x80be000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bed00">
       <class ref="0x80724a0"/>
       <name>da2b</name>
       <rank>3</rank>
 	<consumer id="0x80b8480">
 	  <geom ref="0x80bed00"/>
 	  <provider ref="0x80b9f80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80beb80">
       <class ref="0x80724a0"/>
       <name>da2a</name>
       <rank>3</rank>
 	<consumer id="0x80b8440">
 	  <geom ref="0x80beb80"/>
 	  <provider ref="0x80b9f00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bea00">
       <class ref="0x80724a0"/>
       <name>da1f</name>
       <rank>3</rank>
 	<consumer id="0x80b8400">
 	  <geom ref="0x80bea00"/>
 	  <provider ref="0x80b9c00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be880">
       <class ref="0x80724a0"/>
       <name>da1e</name>
       <rank>3</rank>
 	<consumer id="0x80b83c0">
 	  <geom ref="0x80be880"/>
 	  <provider ref="0x80b9b80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be700">
       <class ref="0x80724a0"/>
       <name>da1c</name>
       <rank>3</rank>
 	<consumer id="0x80b8380">
 	  <geom ref="0x80be700"/>
 	  <provider ref="0x80b9b00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be580">
       <class ref="0x80724a0"/>
       <name>da1b</name>
       <rank>3</rank>
 	<consumer id="0x80b8340">
 	  <geom ref="0x80be580"/>
 	  <provider ref="0x80b9a80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be400">
       <class ref="0x80724a0"/>
       <name>da1a</name>
       <rank>3</rank>
 	<consumer id="0x80b8300">
 	  <geom ref="0x80be400"/>
 	  <provider ref="0x80b9a00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be280">
       <class ref="0x80724a0"/>
       <name>da0c</name>
       <rank>3</rank>
 	<consumer id="0x80b82c0">
 	  <geom ref="0x80be280"/>
 	  <provider ref="0x80b9700"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be100">
       <class ref="0x80724a0"/>
       <name>da0b</name>
       <rank>3</rank>
 	<consumer id="0x80b8280">
 	  <geom ref="0x80be100"/>
 	  <provider ref="0x80b9680"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80be080">
       <class ref="0x80724a0"/>
       <name>da0a</name>
       <rank>3</rank>
 	<consumer id="0x80b8240">
 	  <geom ref="0x80be080"/>
 	  <provider ref="0x80b9600"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9c80">
       <class ref="0x80724a0"/>
       <name>da2</name>
       <rank>2</rank>
 	<consumer id="0x80b81c0">
 	  <geom ref="0x80b9c80"/>
 	  <provider ref="0x80b9280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9780">
       <class ref="0x80724a0"/>
       <name>da1</name>
       <rank>2</rank>
 	<consumer id="0x80b8140">
 	  <geom ref="0x80b9780"/>
 	  <provider ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80b9300">
       <class ref="0x80724a0"/>
       <name>da0</name>
       <rank>2</rank>
 	<consumer id="0x80b80c0">
 	  <geom ref="0x80b9300"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x8072480">
     <name>MBREXT</name>
   </class>
   <class id="0x8072460">
     <name>MBR</name>
   </class>
   <class id="0x80724c0">
     <name>BSD</name>
     <geom id="0x80b9d00">
       <class ref="0x80724c0"/>
       <name>da2</name>
       <rank>2</rank>
-      <magicspace>
-        <name>fill0</name>
-        <offset>0</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>64</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill1</name>
-        <offset>340</offset>
-        <length>172</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8200">
 	  <geom ref="0x80b9d00"/>
 	  <provider ref="0x80b9280"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80be000">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2c</name>
 	  <config>
 	    <index>2</index>
 	    <length>74027520</length>
 	    <seclength>144585</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9f80">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2b</name>
 	  <config>
 	    <index>1</index>
 	    <length>4178442240</length>
 	    <seclength>8161020</seclength>
 	    <offset>2194844813312</offset>
 	    <secoffset>4286806276</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9f00">
 	  <geom ref="0x80b9d00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2a</name>
 	  <config>
 	    <index>0</index>
 	    <length>24675840</length>
 	    <seclength>48195</seclength>
 	    <offset>2194820137472</offset>
 	    <secoffset>4286758081</secoffset>
 	  </config>
 	</provider>
     </geom>
     <geom id="0x80b9800">
       <class ref="0x80724c0"/>
       <name>da1</name>
       <rank>2</rank>
-      <magicspace>
-        <name>fill0</name>
-        <offset>0</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>64</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill1</name>
-        <offset>340</offset>
-        <length>172</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8180">
 	  <geom ref="0x80b9800"/>
 	  <provider ref="0x80b9180"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80b9c00">
 	  <geom ref="0x80b9800"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1f</name>
 	  <config>
 	    <index>5</index>
 	    <length>16951073792</length>
 	    <seclength>33107566</seclength>
 	    <offset>1358921728</offset>
 	    <secoffset>2654144</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9b80">
 	  <geom ref="0x80b9800"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1e</name>
 	  <config>
 	    <index>4</index>
 	    <length>20971520</length>
 	    <seclength>40960</seclength>
 	    <offset>1337950208</offset>
 	    <secoffset>2613184</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9b00">
 	  <geom ref="0x80b9800"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1c</name>
 	  <config>
 	    <index>2</index>
 	    <length>18309995520</length>
 	    <seclength>35761710</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9a80">
 	  <geom ref="0x80b9800"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1b</name>
 	  <config>
 	    <index>1</index>
 	    <length>1086291968</length>
 	    <seclength>2121664</seclength>
 	    <offset>251658240</offset>
 	    <secoffset>491520</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9a00">
 	  <geom ref="0x80b9800"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1a</name>
 	  <config>
 	    <index>0</index>
 	    <length>251658240</length>
 	    <seclength>491520</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
     <geom id="0x80b9380">
       <class ref="0x80724c0"/>
       <name>da0</name>
       <rank>2</rank>
-      <magicspace>
-        <name>fill0</name>
-        <offset>0</offset>
-        <length>64</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>64</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill1</name>
-        <offset>340</offset>
-        <length>172</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b8100">
 	  <geom ref="0x80b9380"/>
 	  <provider ref="0x80b9080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80b9700">
 	  <geom ref="0x80b9380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0c</name>
 	  <config>
 	    <index>2</index>
 	    <length>4335206400</length>
 	    <seclength>8467200</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9680">
 	  <geom ref="0x80b9380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0b</name>
 	  <config>
 	    <index>1</index>
 	    <length>270925824</length>
 	    <seclength>529152</seclength>
 	    <offset>4064280576</offset>
 	    <secoffset>7938048</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80b9600">
 	  <geom ref="0x80b9380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0a</name>
 	  <config>
 	    <index>0</index>
 	    <length>4064280576</length>
 	    <seclength>7938048</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x80723c0">
     <name>SIMDISK-class</name>
     <geom id="0x80b9200">
       <class ref="0x80723c0"/>
       <name>da2</name>
       <rank>1</rank>
 	<provider id="0x80b9280">
 	  <geom ref="0x80b9200"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2</name>
 	</provider>
     </geom>
     <geom id="0x80b9100">
       <class ref="0x80723c0"/>
       <name>da1</name>
       <rank>1</rank>
 	<provider id="0x80b9180">
 	  <geom ref="0x80b9100"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1</name>
 	</provider>
     </geom>
     <geom id="0x80b9000">
       <class ref="0x80723c0"/>
       <name>da0</name>
       <rank>1</rank>
 	<provider id="0x80b9080">
 	  <geom ref="0x80b9000"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0</name>
 	</provider>
     </geom>
   </class>
 </mesh>
Index: head/tools/regression/geom/Test/T014/ref.conf
===================================================================
--- head/tools/regression/geom/Test/T014/ref.conf	(revision 103009)
+++ head/tools/regression/geom/Test/T014/ref.conf	(revision 103010)
@@ -1,231 +1,207 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class id="0x8072fa0">
     <name>DEV-class</name>
     <geom id="0x80bce80">
       <class ref="0x8072fa0"/>
       <name>wd0s1f</name>
       <rank>4</rank>
 	<consumer id="0x80b9240">
 	  <geom ref="0x80bce80"/>
 	  <provider ref="0x80bc900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcd00">
       <class ref="0x8072fa0"/>
       <name>wd0s1e</name>
       <rank>4</rank>
 	<consumer id="0x80b9200">
 	  <geom ref="0x80bcd00"/>
 	  <provider ref="0x80bc880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bcb80">
       <class ref="0x8072fa0"/>
       <name>wd0s1c</name>
       <rank>4</rank>
 	<consumer id="0x80b91c0">
 	  <geom ref="0x80bcb80"/>
 	  <provider ref="0x80bc800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bca00">
       <class ref="0x8072fa0"/>
       <name>wd0s1b</name>
       <rank>4</rank>
 	<consumer id="0x80b9180">
 	  <geom ref="0x80bca00"/>
 	  <provider ref="0x80bc780"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc980">
       <class ref="0x8072fa0"/>
       <name>wd0s1a</name>
       <rank>4</rank>
 	<consumer id="0x80b9140">
 	  <geom ref="0x80bc980"/>
 	  <provider ref="0x80bc700"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc300">
       <class ref="0x8072fa0"/>
       <name>wd0s1</name>
       <rank>3</rank>
 	<consumer id="0x80b90c0">
 	  <geom ref="0x80bc300"/>
 	  <provider ref="0x80bc280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom id="0x80bc100">
       <class ref="0x8072fa0"/>
       <name>wd0</name>
       <rank>2</rank>
 	<consumer id="0x80b9040">
 	  <geom ref="0x80bc100"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class id="0x8072e80">
     <name>PC98</name>
     <geom id="0x80bc180">
       <class ref="0x8072e80"/>
       <name>wd0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8704</frontstuff>
       </config>
 	<consumer id="0x80b9080">
 	  <geom ref="0x80bc180"/>
 	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bc280">
 	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1</name>
 	  <config>
 	    <index>0</index>
 	    <length>1626533888</length>
 	    <seclength>3176824</seclength>
 	    <offset>69632</offset>
 	    <secoffset>136</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072ea0">
     <name>SUN</name>
   </class>
   <class id="0x8072f80">
     <name>MBREXT</name>
   </class>
   <class id="0x8072f60">
     <name>MBR</name>
   </class>
   <class id="0x8072fc0">
     <name>BSD</name>
     <geom id="0x80bc480">
       <class ref="0x8072fc0"/>
       <name>wd0s1</name>
       <rank>3</rank>
-      <magicspace>
-        <name>boot1</name>
-        <offset>0</offset>
-        <length>512</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>label</name>
-        <offset>512</offset>
-        <length>276</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>fill0</name>
-        <offset>748</offset>
-        <length>236</length>
-        <flags>0</flags>
-      </magicspace>
-      <magicspace>
-        <name>boot2</name>
-        <offset>1024</offset>
-        <length>7168</length>
-        <flags>0</flags>
-      </magicspace>
       <config>
 	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
 	<consumer id="0x80b9100">
 	  <geom ref="0x80bc480"/>
 	  <provider ref="0x80bc280"/>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider id="0x80bc900">
 	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1f</name>
 	  <config>
 	    <index>5</index>
 	    <length>1390673920</length>
 	    <seclength>2716160</seclength>
 	    <offset>235929600</offset>
 	    <secoffset>460800</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc880">
 	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1e</name>
 	  <config>
 	    <index>4</index>
 	    <length>52428800</length>
 	    <seclength>102400</seclength>
 	    <offset>183500800</offset>
 	    <secoffset>358400</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc800">
 	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1c</name>
 	  <config>
 	    <index>2</index>
 	    <length>1626603520</length>
 	    <seclength>3176960</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc780">
 	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1b</name>
 	  <config>
 	    <index>1</index>
 	    <length>104857600</length>
 	    <seclength>204800</seclength>
 	    <offset>78643200</offset>
 	    <secoffset>153600</secoffset>
 	  </config>
 	</provider>
 	<provider id="0x80bc700">
 	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1a</name>
 	  <config>
 	    <index>0</index>
 	    <length>78643200</length>
 	    <seclength>153600</seclength>
 	    <offset>0</offset>
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
     </geom>
   </class>
   <class id="0x8072ec0">
     <name>SIMDISK-class</name>
     <geom id="0x80bc000">
       <class ref="0x8072ec0"/>
       <name>wd0</name>
       <rank>1</rank>
 	<provider id="0x80bc080">
 	  <geom ref="0x80bc000"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0</name>
 	</provider>
     </geom>
   </class>
 </mesh>