Add another two alpha disks to this testcase.

2 files changed, 317 insertions, 35 deletions

diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 939145d..1c47642 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,86 +1,342 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
   <class>
-    <ref>0x8072220</ref>
+    <ref>0x8072260</ref>
     <name>DEV-class</name>
     <geom>
-      <ref>0x80b9380</ref>
-      <class><ref>0x8072220</ref></class>
+      <ref>0x80be180</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da2c</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8a80</ref>
+	  <geom><ref>0x80be180</ref></geom>
+	  <provider><ref>0x80b87c0</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80be000</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da2b</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8a40</ref>
+	  <geom><ref>0x80be000</ref></geom>
+	  <provider><ref>0x80b8780</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bce80</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da2a</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8a00</ref>
+	  <geom><ref>0x80bce80</ref></geom>
+	  <provider><ref>0x80b8740</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bcd00</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1f</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b89c0</ref>
+	  <geom><ref>0x80bcd00</ref></geom>
+	  <provider><ref>0x80b8600</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bcb80</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1e</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8980</ref>
+	  <geom><ref>0x80bcb80</ref></geom>
+	  <provider><ref>0x80b85c0</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bca00</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1c</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8940</ref>
+	  <geom><ref>0x80bca00</ref></geom>
+	  <provider><ref>0x80b8580</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bc880</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1b</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b8900</ref>
+	  <geom><ref>0x80bc880</ref></geom>
+	  <provider><ref>0x80b8540</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bc700</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1a</name>
+      <rank>3</rank>
+	<consumer>
+	  <ref>0x80b88c0</ref>
+	  <geom><ref>0x80bc700</ref></geom>
+	  <provider><ref>0x80b8500</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80bc580</ref>
+      <class><ref>0x8072260</ref></class>
       <name>da0c</name>
       <rank>3</rank>
 	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80b9380</ref></geom>
-	  <provider><ref>0x80b8240</ref></provider>
+	  <ref>0x80b8880</ref>
+	  <geom><ref>0x80bc580</ref></geom>
+	  <provider><ref>0x80b83c0</ref></provider>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom>
-      <ref>0x80b9200</ref>
-      <class><ref>0x8072220</ref></class>
+      <ref>0x80bc400</ref>
+      <class><ref>0x8072260</ref></class>
       <name>da0b</name>
       <rank>3</rank>
 	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80b9200</ref></geom>
-	  <provider><ref>0x80b8200</ref></provider>
+	  <ref>0x80b8840</ref>
+	  <geom><ref>0x80bc400</ref></geom>
+	  <provider><ref>0x80b8380</ref></provider>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom>
-      <ref>0x80b9180</ref>
-      <class><ref>0x8072220</ref></class>
+      <ref>0x80bc380</ref>
+      <class><ref>0x8072260</ref></class>
       <name>da0a</name>
       <rank>3</rank>
 	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80b9180</ref></geom>
-	  <provider><ref>0x80b81c0</ref></provider>
+	  <ref>0x80b8800</ref>
+	  <geom><ref>0x80bc380</ref></geom>
+	  <provider><ref>0x80b8340</ref></provider>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
     <geom>
-      <ref>0x80b80c0</ref>
-      <class><ref>0x8072220</ref></class>
+      <ref>0x80b8640</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da2</name>
+      <rank>2</rank>
+	<consumer>
+	  <ref>0x80b8680</ref>
+	  <geom><ref>0x80b8640</ref></geom>
+	  <provider><ref>0x80b8200</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80b8400</ref>
+      <class><ref>0x8072260</ref></class>
+      <name>da1</name>
+      <rank>2</rank>
+	<consumer>
+	  <ref>0x80b8440</ref>
+	  <geom><ref>0x80b8400</ref></geom>
+	  <provider><ref>0x80b8140</ref></provider>
+	  <mode>r0w0e0</mode>
+	</consumer>
+    </geom>
+    <geom>
+      <ref>0x80b8240</ref>
+      <class><ref>0x8072260</ref></class>
       <name>da0</name>
       <rank>2</rank>
 	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80b80c0</ref></geom>
+	  <ref>0x80b8280</ref>
+	  <geom><ref>0x80b8240</ref></geom>
 	  <provider><ref>0x80b8080</ref></provider>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
   <class>
-    <ref>0x80721e0</ref>
+    <ref>0x8072220</ref>
     <name>MBREXT-class</name>
   </class>
   <class>
-    <ref>0x80721a0</ref>
+    <ref>0x80721e0</ref>
     <name>MBR-class</name>
   </class>
   <class>
-    <ref>0x8072260</ref>
+    <ref>0x80722a0</ref>
     <name>BSD-class</name>
     <geom>
-      <ref>0x80b8140</ref>
-      <class><ref>0x8072260</ref></class>
+      <ref>0x80b86c0</ref>
+      <class><ref>0x80722a0</ref></class>
+      <name>da2</name>
+      <rank>2</rank>
+      <config>
+      </config>
+	<consumer>
+	  <ref>0x80b8700</ref>
+	  <geom><ref>0x80b86c0</ref></geom>
+	  <provider><ref>0x80b8200</ref></provider>
+	  <mode>r0w0e0</mode>
+	  <config>
+	  </config>
+	</consumer>
+	<provider>
+	  <ref>0x80b87c0</ref>
+	  <geom><ref>0x80b86c0</ref></geom>
+	  <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>
+	  <ref>0x80b8780</ref>
+	  <geom><ref>0x80b86c0</ref></geom>
+	  <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>
+	  <ref>0x80b8740</ref>
+	  <geom><ref>0x80b86c0</ref></geom>
+	  <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>
+      <ref>0x80b8480</ref>
+      <class><ref>0x80722a0</ref></class>
+      <name>da1</name>
+      <rank>2</rank>
+      <config>
+      </config>
+	<consumer>
+	  <ref>0x80b84c0</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <provider><ref>0x80b8140</ref></provider>
+	  <mode>r0w0e0</mode>
+	  <config>
+	  </config>
+	</consumer>
+	<provider>
+	  <ref>0x80b8600</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <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>
+	  <ref>0x80b85c0</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <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>
+	  <ref>0x80b8580</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <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>
+	  <ref>0x80b8540</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <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>
+	  <ref>0x80b8500</ref>
+	  <geom><ref>0x80b8480</ref></geom>
+	  <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>
+      <ref>0x80b82c0</ref>
+      <class><ref>0x80722a0</ref></class>
       <name>da0</name>
       <rank>2</rank>
       <config>
       </config>
 	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80b8140</ref></geom>
+	  <ref>0x80b8300</ref>
+	  <geom><ref>0x80b82c0</ref></geom>
 	  <provider><ref>0x80b8080</ref></provider>
 	  <mode>r0w0e0</mode>
 	  <config>
 	  </config>
 	</consumer>
 	<provider>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80b8140</ref></geom>
+	  <ref>0x80b83c0</ref>
+	  <geom><ref>0x80b82c0</ref></geom>
 	  <mode>r0w0e0</mode>
 	  <name>da0c</name>
 	  <config>
@@ -92,8 +348,8 @@
 	  </config>
 	</provider>
 	<provider>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80b8140</ref></geom>
+	  <ref>0x80b8380</ref>
+	  <geom><ref>0x80b82c0</ref></geom>
 	  <mode>r0w0e0</mode>
 	  <name>da0b</name>
 	  <config>
@@ -105,8 +361,8 @@
 	  </config>
 	</provider>
 	<provider>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80b8140</ref></geom>
+	  <ref>0x80b8340</ref>
+	  <geom><ref>0x80b82c0</ref></geom>
 	  <mode>r0w0e0</mode>
 	  <name>da0a</name>
 	  <config>
@@ -120,11 +376,35 @@
     </geom>
   </class>
   <class>
-    <ref>0x80720e0</ref>
+    <ref>0x8072120</ref>
     <name>SIMDISK-class</name>
     <geom>
+      <ref>0x80b81c0</ref>
+      <class><ref>0x8072120</ref></class>
+      <name>da2</name>
+      <rank>1</rank>
+	<provider>
+	  <ref>0x80b8200</ref>
+	  <geom><ref>0x80b81c0</ref></geom>
+	  <mode>r0w0e0</mode>
+	  <name>da2</name>
+	</provider>
+    </geom>
+    <geom>
+      <ref>0x80b8100</ref>
+      <class><ref>0x8072120</ref></class>
+      <name>da1</name>
+      <rank>1</rank>
+	<provider>
+	  <ref>0x80b8140</ref>
+	  <geom><ref>0x80b8100</ref></geom>
+	  <mode>r0w0e0</mode>
+	  <name>da1</name>
+	</provider>
+    </geom>
+    <geom>
       <ref>0x80b8040</ref>
-      <class><ref>0x80720e0</ref></class>
+      <class><ref>0x8072120</ref></class>
       <name>da0</name>
       <rank>1</rank>
 	<provider>
diff --git a/tools/regression/geom/Test/T013/testprg.c b/tools/regression/geom/Test/T013/testprg.c
index ce91b5e..aebd9d9 100644
--- a/tools/regression/geom/Test/T013/testprg.c
+++ b/tools/regression/geom/Test/T013/testprg.c
@@ -61,6 +61,8 @@ thread_sim(void *ptr __unused)
 
 
 	g_simdisk_xml_load("da0", "../../Data/disk.beast.da0.xml");
+	g_simdisk_xml_load("da1", "../../Data/disk.alpha.da0.xml");
+	g_simdisk_xml_load("da2", "../../Data/disk.alpha2.da0.xml");
 	rattle();
 	conff("1");
 	printf("Done\n");