From 3e3f720cb0455c95c53548eedafd4564d32062e0 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 Sep 2020 23:37:49 +0000
Subject: [PATCH] Remove disk images / tests from alpha, sun and pc98

These images are no longer relevant...  However, I've also not tested
the regression test here to see if it still works or not... It needs
a lot of love regardless...
---
 tools/regression/geom/ConfCmp/a2.conf         | 207 -----------------
 tools/regression/geom/ConfCmp/a2a.conf        | 207 -----------------
 tools/regression/geom/ConfCmp/a2b.conf        | 207 -----------------
 tools/regression/geom/ConfCmp/a2c.conf        | 206 -----------------
 tools/regression/geom/ConfCmp/a2d.conf        | 211 ------------------
 tools/regression/geom/Data/disk.alpha.da0.xml |  33 ---
 .../regression/geom/Data/disk.alpha2.da0.xml  |  33 ---
 tools/regression/geom/Data/disk.pc98.wdc0.xml |  75 -------
 tools/regression/geom/Data/disk.sun.da0.xml   |  33 ---
 tools/regression/geom/Data/disk.sun.da1.xml   |  33 ---
 tools/regression/geom/Ref/disk.alpha.da0.xml  |   7 -
 tools/regression/geom/Ref/disk.alpha2.da0.xml |   5 -
 tools/regression/geom/Ref/disk.pc98.wdc0.xml  |   8 -
 tools/regression/geom/Ref/disk.sun.da0.xml    |   6 -
 tools/regression/geom/Ref/disk.sun.da1.xml    |   9 -
 15 files changed, 1280 deletions(-)
 delete mode 100644 tools/regression/geom/ConfCmp/a2.conf
 delete mode 100644 tools/regression/geom/ConfCmp/a2a.conf
 delete mode 100644 tools/regression/geom/ConfCmp/a2b.conf
 delete mode 100644 tools/regression/geom/ConfCmp/a2c.conf
 delete mode 100644 tools/regression/geom/ConfCmp/a2d.conf
 delete mode 100644 tools/regression/geom/Data/disk.alpha.da0.xml
 delete mode 100644 tools/regression/geom/Data/disk.alpha2.da0.xml
 delete mode 100644 tools/regression/geom/Data/disk.pc98.wdc0.xml
 delete mode 100644 tools/regression/geom/Data/disk.sun.da0.xml
 delete mode 100644 tools/regression/geom/Data/disk.sun.da1.xml
 delete mode 100644 tools/regression/geom/Ref/disk.alpha.da0.xml
 delete mode 100644 tools/regression/geom/Ref/disk.alpha2.da0.xml
 delete mode 100644 tools/regression/geom/Ref/disk.pc98.wdc0.xml
 delete mode 100644 tools/regression/geom/Ref/disk.sun.da0.xml
 delete mode 100644 tools/regression/geom/Ref/disk.sun.da1.xml

diff --git a/tools/regression/geom/ConfCmp/a2.conf b/tools/regression/geom/ConfCmp/a2.conf
deleted file mode 100644
index 6688fd1ea451..000000000000
--- a/tools/regression/geom/ConfCmp/a2.conf
+++ /dev/null
@@ -1,207 +0,0 @@
-<mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80740e0">
-    <name>DEV-class</name>
-    <geom id="0x80bce00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1f</name>
-      <rank>4</rank>
-	<consumer id="0x80ba240">
-	  <geom ref="0x80bce00"/>
-	  <provider ref="0x80bc880"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcc80">
-      <class ref="0x80740e0"/>
-      <name>wd0s1e</name>
-      <rank>4</rank>
-	<consumer id="0x80ba200">
-	  <geom ref="0x80bcc80"/>
-	  <provider ref="0x80bc800"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcb00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1c</name>
-      <rank>4</rank>
-	<consumer id="0x80ba1c0">
-	  <geom ref="0x80bcb00"/>
-	  <provider ref="0x80bc780"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc980">
-      <class ref="0x80740e0"/>
-      <name>wd0s1b</name>
-      <rank>4</rank>
-	<consumer id="0x80ba180">
-	  <geom ref="0x80bc980"/>
-	  <provider ref="0x80bc700"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc900">
-      <class ref="0x80740e0"/>
-      <name>wd0s1a</name>
-      <rank>4</rank>
-	<consumer id="0x80ba140">
-	  <geom ref="0x80bc900"/>
-	  <provider ref="0x80bc680"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc300">
-      <class ref="0x80740e0"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-	<consumer id="0x80ba0c0">
-	  <geom ref="0x80bc300"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc100">
-      <class ref="0x80740e0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-	<consumer id="0x80ba040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-  </class>
-  <class id="0x8073fc0">
-    <name>PC98-class</name>
-    <geom id="0x80bc180">
-      <class ref="0x8073fc0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-      <config>
-	<frontstuff>8704</frontstuff>
-      </config>
-	<consumer id="0x80ba080">
-	  <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="0x8073fe0">
-    <name>SUNLABEL-class</name>
-  </class>
-  <class id="0x80740c0">
-    <name>MBREXT-class</name>
-  </class>
-  <class id="0x80740a0">
-    <name>MBR-class</name>
-  </class>
-  <class id="0x8074100">
-    <name>BSD-class</name>
-    <geom id="0x80bc480">
-      <class ref="0x8074100"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-      <config>
-	<labeloffset>512</labeloffset>
-	<frontstuff>8192</frontstuff>
-      </config>
-	<consumer id="0x80ba100">
-	  <geom ref="0x80bc480"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x80bc880">
-	  <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="0x80bc800">
-	  <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="0x80bc780">
-	  <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="0x80bc700">
-	  <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="0x80bc680">
-	  <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="0x8074000">
-    <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8074000"/>
-      <name>wd0</name>
-      <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
-	  <mode>r0w0e0</mode>
-	  <name>wd0</name>
-	</provider>
-    </geom>
-  </class>
-</mesh>
diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/tools/regression/geom/ConfCmp/a2a.conf
deleted file mode 100644
index 3d35fe9d32c9..000000000000
--- a/tools/regression/geom/ConfCmp/a2a.conf
+++ /dev/null
@@ -1,207 +0,0 @@
-<mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x90740e0">
-    <name>DEV-class</name>
-    <geom id="0x90bce00">
-      <class ref="0x90740e0"/>
-      <name>wd0s1f</name>
-      <rank>4</rank>
-	<consumer id="0x90ba240">
-	  <geom ref="0x90bce00"/>
-	  <provider ref="0x90bc880"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bcc80">
-      <class ref="0x90740e0"/>
-      <name>wd0s1e</name>
-      <rank>4</rank>
-	<consumer id="0x90ba200">
-	  <geom ref="0x90bcc80"/>
-	  <provider ref="0x90bc800"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bcb00">
-      <class ref="0x90740e0"/>
-      <name>wd0s1c</name>
-      <rank>4</rank>
-	<consumer id="0x90ba1c0">
-	  <geom ref="0x90bcb00"/>
-	  <provider ref="0x90bc780"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bc980">
-      <class ref="0x90740e0"/>
-      <name>wd0s1b</name>
-      <rank>4</rank>
-	<consumer id="0x90ba180">
-	  <geom ref="0x90bc980"/>
-	  <provider ref="0x90bc700"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bc900">
-      <class ref="0x90740e0"/>
-      <name>wd0s1a</name>
-      <rank>4</rank>
-	<consumer id="0x90ba140">
-	  <geom ref="0x90bc900"/>
-	  <provider ref="0x90bc680"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bc300">
-      <class ref="0x90740e0"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-	<consumer id="0x90ba0c0">
-	  <geom ref="0x90bc300"/>
-	  <provider ref="0x90bc280"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x90bc100">
-      <class ref="0x90740e0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-	<consumer id="0x90ba040">
-	  <geom ref="0x90bc100"/>
-	  <provider ref="0x90bc080"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-  </class>
-  <class id="0x9073fc0">
-    <name>PC98-class</name>
-    <geom id="0x90bc180">
-      <class ref="0x9073fc0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-      <config>
-	<frontstuff>8704</frontstuff>
-      </config>
-	<consumer id="0x90ba080">
-	  <geom ref="0x90bc180"/>
-	  <provider ref="0x90bc080"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x90bc280">
-	  <geom ref="0x90bc180"/>
-	  <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="0x9073fe0">
-    <name>SUNLABEL-class</name>
-  </class>
-  <class id="0x90740c0">
-    <name>MBREXT-class</name>
-  </class>
-  <class id="0x90740a0">
-    <name>MBR-class</name>
-  </class>
-  <class id="0x9074100">
-    <name>BSD-class</name>
-    <geom id="0x90bc480">
-      <class ref="0x9074100"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-      <config>
-	<labeloffset>512</labeloffset>
-	<frontstuff>8192</frontstuff>
-      </config>
-	<consumer id="0x90ba100">
-	  <geom ref="0x90bc480"/>
-	  <provider ref="0x90bc280"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x90bc880">
-	  <geom ref="0x90bc480"/>
-	  <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="0x90bc800">
-	  <geom ref="0x90bc480"/>
-	  <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="0x90bc780">
-	  <geom ref="0x90bc480"/>
-	  <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="0x90bc700">
-	  <geom ref="0x90bc480"/>
-	  <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="0x90bc680">
-	  <geom ref="0x90bc480"/>
-	  <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="0x9074000">
-    <name>SIMDISK-class</name>
-    <geom id="0x90bc000">
-      <class ref="0x9074000"/>
-      <name>wd0</name>
-      <rank>1</rank>
-	<provider id="0x90bc080">
-	  <geom ref="0x90bc000"/>
-	  <mode>r0w0e0</mode>
-	  <name>wd0</name>
-	</provider>
-    </geom>
-  </class>
-</mesh>
diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/tools/regression/geom/ConfCmp/a2b.conf
deleted file mode 100644
index 58c0e15b64f1..000000000000
--- a/tools/regression/geom/ConfCmp/a2b.conf
+++ /dev/null
@@ -1,207 +0,0 @@
-<mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80740e0">
-    <name>DEV-class</name>
-    <geom id="0x80bce00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1f</name>
-      <rank>4</rank>
-	<consumer id="0x80ba240">
-	  <geom ref="0x80bce00"/>
-	  <provider ref="0x80bc880"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcc80">
-      <class ref="0x80740e0"/>
-      <name>wd0s1e</name>
-      <rank>4</rank>
-	<consumer id="0x80ba200">
-	  <geom ref="0x80bcc80"/>
-	  <provider ref="0x80bc800"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcb00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1c</name>
-      <rank>4</rank>
-	<consumer id="0x80ba1c0">
-	  <geom ref="0x80bcb00"/>
-	  <provider ref="0x80bc780"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc980">
-      <class ref="0x80740e0"/>
-      <name>wd0s1b</name>
-      <rank>4</rank>
-	<consumer id="0x80ba180">
-	  <geom ref="0x80bc981"/>
-	  <provider ref="0x80bc700"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc900">
-      <class ref="0x80740e0"/>
-      <name>wd0s1a</name>
-      <rank>4</rank>
-	<consumer id="0x80ba140">
-	  <geom ref="0x80bc900"/>
-	  <provider ref="0x80bc680"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc300">
-      <class ref="0x80740e0"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-	<consumer id="0x80ba0c0">
-	  <geom ref="0x80bc300"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc100">
-      <class ref="0x80740e0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-	<consumer id="0x80ba040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-  </class>
-  <class id="0x8073fc0">
-    <name>PC98-class</name>
-    <geom id="0x80bc180">
-      <class ref="0x8073fc0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-      <config>
-	<frontstuff>8704</frontstuff>
-      </config>
-	<consumer id="0x80ba080">
-	  <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="0x8073fe0">
-    <name>SUNLABEL-class</name>
-  </class>
-  <class id="0x80740c0">
-    <name>MBREXT-class</name>
-  </class>
-  <class id="0x80740a0">
-    <name>MBR-class</name>
-  </class>
-  <class id="0x8074100">
-    <name>BSD-class</name>
-    <geom id="0x80bc480">
-      <class ref="0x8074100"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-      <config>
-	<labeloffset>512</labeloffset>
-	<frontstuff>8192</frontstuff>
-      </config>
-	<consumer id="0x80ba100">
-	  <geom ref="0x80bc480"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x80bc880">
-	  <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="0x80bc800">
-	  <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="0x80bc780">
-	  <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="0x80bc700">
-	  <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="0x80bc680">
-	  <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="0x8074000">
-    <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8074000"/>
-      <name>wd0</name>
-      <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
-	  <mode>r0w0e0</mode>
-	  <name>wd0</name>
-	</provider>
-    </geom>
-  </class>
-</mesh>
diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/tools/regression/geom/ConfCmp/a2c.conf
deleted file mode 100644
index 381c4106a52f..000000000000
--- a/tools/regression/geom/ConfCmp/a2c.conf
+++ /dev/null
@@ -1,206 +0,0 @@
-<mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80740e0">
-    <name>DEV-class</name>
-    <geom id="0x80bce00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1f</name>
-      <rank>4</rank>
-	<consumer id="0x80ba240">
-	  <geom ref="0x80bce00"/>
-	  <provider ref="0x80bc880"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcc80">
-      <class ref="0x80740e0"/>
-      <name>wd0s1e</name>
-      <rank>4</rank>
-	<consumer id="0x80ba200">
-	  <geom ref="0x80bcc80"/>
-	  <provider ref="0x80bc800"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcb00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1c</name>
-      <rank>4</rank>
-	<consumer id="0x80ba1c0">
-	  <geom ref="0x80bcb00"/>
-	  <provider ref="0x80bc780"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc980">
-      <class ref="0x80740e0"/>
-      <name>wd0s1b</name>
-      <rank>4</rank>
-	<consumer id="0x80ba180">
-	  <geom ref="0x80bc980"/>
-	  <provider ref="0x80bc700"/>
-	</consumer>
-    </geom>
-    <geom id="0x80bc900">
-      <class ref="0x80740e0"/>
-      <name>wd0s1a</name>
-      <rank>4</rank>
-	<consumer id="0x80ba140">
-	  <geom ref="0x80bc900"/>
-	  <provider ref="0x80bc680"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc300">
-      <class ref="0x80740e0"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-	<consumer id="0x80ba0c0">
-	  <geom ref="0x80bc300"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc100">
-      <class ref="0x80740e0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-	<consumer id="0x80ba040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-  </class>
-  <class id="0x8073fc0">
-    <name>PC98-class</name>
-    <geom id="0x80bc180">
-      <class ref="0x8073fc0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-      <config>
-	<frontstuff>8704</frontstuff>
-      </config>
-	<consumer id="0x80ba080">
-	  <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="0x8073fe0">
-    <name>SUNLABEL-class</name>
-  </class>
-  <class id="0x80740c0">
-    <name>MBREXT-class</name>
-  </class>
-  <class id="0x80740a0">
-    <name>MBR-class</name>
-  </class>
-  <class id="0x8074100">
-    <name>BSD-class</name>
-    <geom id="0x80bc480">
-      <class ref="0x8074100"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-      <config>
-	<labeloffset>512</labeloffset>
-	<frontstuff>8192</frontstuff>
-      </config>
-	<consumer id="0x80ba100">
-	  <geom ref="0x80bc480"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x80bc880">
-	  <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="0x80bc800">
-	  <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="0x80bc780">
-	  <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="0x80bc700">
-	  <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="0x80bc680">
-	  <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="0x8074000">
-    <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8074000"/>
-      <name>wd0</name>
-      <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
-	  <mode>r0w0e0</mode>
-	  <name>wd0</name>
-	</provider>
-    </geom>
-  </class>
-</mesh>
diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/tools/regression/geom/ConfCmp/a2d.conf
deleted file mode 100644
index bccaed5e43fa..000000000000
--- a/tools/regression/geom/ConfCmp/a2d.conf
+++ /dev/null
@@ -1,211 +0,0 @@
-<mesh>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <class id="0x80740e0">
-    <name>DEV-class</name>
-    <geom id="0x80bce00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1f</name>
-      <rank>4</rank>
-	<consumer id="0x80ba240">
-	  <geom ref="0x80bce00"/>
-	  <provider ref="0x80bc880"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcc80">
-      <class ref="0x80740e0"/>
-      <name>wd0s1e</name>
-      <rank>4</rank>
-	<consumer id="0x80ba200">
-	  <geom ref="0x80bcc80"/>
-	  <provider ref="0x80bc800"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bcb00">
-      <class ref="0x80740e0"/>
-      <name>wd0s1c</name>
-      <rank>4</rank>
-	<consumer id="0x80ba1c0">
-	  <geom ref="0x80bcb00"/>
-	  <provider ref="0x80bc780"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc980">
-      <class ref="0x80740e0"/>
-      <name>wd0s1b</name>
-      <rank>4</rank>
-	<consumer id="0x80ba180">
-	  <geom ref="0x80bc980"/>
-	  <provider ref="0x80bc700"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc900">
-      <class ref="0x80740e0"/>
-      <name>wd0s1a</name>
-      <rank>4</rank>
-	<consumer id="0x80ba140">
-	  <geom ref="0x80bc900"/>
-	  <provider ref="0x80bc680"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-	<consumer id="0x80ba141">
-	  <geom ref="0x80bc900"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc300">
-      <class ref="0x80740e0"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-	<consumer id="0x80ba0c0">
-	  <geom ref="0x80bc300"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-    <geom id="0x80bc100">
-      <class ref="0x80740e0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-	<consumer id="0x80ba040">
-	  <geom ref="0x80bc100"/>
-	  <provider ref="0x80bc080"/>
-	  <mode>r0w0e0</mode>
-	</consumer>
-    </geom>
-  </class>
-  <class id="0x8073fc0">
-    <name>PC98-class</name>
-    <geom id="0x80bc180">
-      <class ref="0x8073fc0"/>
-      <name>wd0</name>
-      <rank>2</rank>
-      <config>
-	<frontstuff>8704</frontstuff>
-      </config>
-	<consumer id="0x80ba080">
-	  <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="0x8073fe0">
-    <name>SUNLABEL-class</name>
-  </class>
-  <class id="0x80740c0">
-    <name>MBREXT-class</name>
-  </class>
-  <class id="0x80740a0">
-    <name>MBR-class</name>
-  </class>
-  <class id="0x8074100">
-    <name>BSD-class</name>
-    <geom id="0x80bc480">
-      <class ref="0x8074100"/>
-      <name>wd0s1</name>
-      <rank>3</rank>
-      <config>
-	<labeloffset>512</labeloffset>
-	<frontstuff>8192</frontstuff>
-      </config>
-	<consumer id="0x80ba100">
-	  <geom ref="0x80bc480"/>
-	  <provider ref="0x80bc280"/>
-	  <mode>r0w0e0</mode>
-	  <config>
-	  </config>
-	</consumer>
-	<provider id="0x80bc880">
-	  <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="0x80bc800">
-	  <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="0x80bc780">
-	  <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="0x80bc700">
-	  <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="0x80bc680">
-	  <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="0x8074000">
-    <name>SIMDISK-class</name>
-    <geom id="0x80bc000">
-      <class ref="0x8074000"/>
-      <name>wd0</name>
-      <rank>1</rank>
-	<provider id="0x80bc080">
-	  <geom ref="0x80bc000"/>
-	  <mode>r0w0e0</mode>
-	  <name>wd0</name>
-	</provider>
-    </geom>
-  </class>
-</mesh>
diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/tools/regression/geom/Data/disk.alpha.da0.xml
deleted file mode 100644
index 670fcc38d596..000000000000
--- a/tools/regression/geom/Data/disk.alpha.da0.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <comment>
-    Yet an alpha disklabel.
-  </comment>
-  <sectorsize>512</sectorsize>
-  <mediasize>0</mediasize>
-  <fwsectors>0</fwsectors>
-  <fwheads>0</fwheads>
-  <fwcylinders>0</fwcylinders>
-  <sector>
-    <offset>0</offset>
-    <hexdata>
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	574556820400000057444947544c202000000000000000000000000000000000
-	0000000000000000000200003f000000ff000000b2080000c13e00002eae2102
-	0000000000000000100e01000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000057455682a22908000020000000200000008007000000000000040000
-	07081600c05f20000080070000000000010000002eae21020000000000000000
-	000000000000000000000000000000000000000000a00000c0df270000040000
-	070818006e2ef901c07f28000004000007081600000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0e0000000000000001000000000000000000000000000000c51a45ca2ad1dba8
-    </hexdata>
-  </sector>
-</DISKIMAGE>
diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/tools/regression/geom/Data/disk.alpha2.da0.xml
deleted file mode 100644
index 5b341b174d6d..000000000000
--- a/tools/regression/geom/Data/disk.alpha2.da0.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <comment>
-    alpha label which O'brien says blows up libdisk
-  </comment>
-  <sectorsize>512</sectorsize>
-  <mediasize>0</mediasize>
-  <fwsectors>0</fwsectors>
-  <fwheads>0</fwheads>
-  <fwcylinders>0</fwcylinders>
-  <sector>
-    <offset>0</offset>
-    <hexdata>
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	5745568204000000000000000000000000000000000000000000000000000000
-	0000000000000000000200003f000000ff00000009020000c13e0000c9b67f00
-	0000000000000000100e01000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	000000005745568219cf0300002000000020000043bc0000c13e000000000000
-	08000000fc867c0004fb00000000000008000000c934020000827d0000000000
-	0100000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	00000000000000000000000000000000000000005a5a5a5a5a5a5a5a5a5a5a5a
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a
-	9800000000000000020000000000000000000000000000007a13ad55a1c382b0
-    </hexdata>
-  </sector>
-</DISKIMAGE>
diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/tools/regression/geom/Data/disk.pc98.wdc0.xml
deleted file mode 100644
index 6bae97fd2d92..000000000000
--- a/tools/regression/geom/Data/disk.pc98.wdc0.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<DISKIMAGE>
-  <FreeBSD>$FreeBSD$</FreeBSD>
-  <comment>
-    A PC98 disklabel from Warner
-  </comment>
-  <sectorsize>512</sectorsize>
-  <mediasize>0</mediasize>
-  <fwsectors>17</fwsectors>
-  <fwheads>8</fwheads>
-  <fwcylinders>0</fwcylinders>
-  <sector>
-    <offset>0</offset>
-    <hexdata>
-	e9fd009049504c310000001ea08405b48ecd1ba820742232dbb414cd1b721a80
-	fb847515e896007303eb6b90b424bb0004b93012ba4001cd1bbb0001b484cd1b
-	b40633c933d2508cc82dc0038ec05833edcd1b7241b406ba010081c50008cd1b
-	7234ba0400f7c300aa7403ba0200b406bb001c81c50008cd1b721b508bc5b104
-	d3e88cc103c18bf058e815002e89360a002eff1e0800e80800b40ecd1bb90100
-	cb56a0840532dbb414cd1b720e80fb8475092ec606d40000e802005ec3b4b0be
-	d000ba06001e0e1fcd1bb4b0cd1b1fc31e000000010000000000000000000000
-	000000000000000000000000000000000000000000000000000000000d0055aa
-	fa601e066800d81f33f6b51e813c8b46750e817c0204eb7507817c05b4007405
-	46e2e9eb6032ff8a5c040358f18d7c03be9a012e015c03b00cba6104eeb002ba
-	3d05ee68009807b95b00f32ea4b9ff0f33f633d226ad02f402d0e2f8f6def6da
-	268914b416b3c2e4f0a840750680cc2080cb048ac3ba3f04ee8ac4ba3d05eeb0
-	08ba6104ee071f612ec7060000eb0a2ec70602009090fbe966fec390e8ebffb9
-	21007402b1118bc1f6660702460612e5912ef66703f7660403c183d200c3fec2
-	26881605205926880e0a20c390909090905191b81100502ef6670291f7f126a3
-	0220599233d2f7f12680260420f02608060420ebc9000000000080010d0055aa
-    </hexdata>
-  </sector>
-  <sector>
-    <offset>512</offset>
-    <hexdata>
-	94c4000000000100000001000000405b46726565425344000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-    </hexdata>
-  </sector>
-  <sector>
-    <offset>70144</offset>
-    <hexdata>
-	5745568205000000776430733100000000000000000000000000000000000000
-	0000000000000000000200001100000008000000415b000088000000887a3000
-	0000000000000000100e01000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	000000005745568295f208000020000000200000005802008800000000000000
-	0700000000200300885802000000000001000000007a30008800000000000000
-	0000000000000000000000000000000000000000009001008878050000000000
-	0700000000722900880807000000000007000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-    </hexdata>
-  </sector>
-</DISKIMAGE>
diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/tools/regression/geom/Data/disk.sun.da0.xml
deleted file mode 100644
index 826581f086b0..000000000000
--- a/tools/regression/geom/Data/disk.sun.da0.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<DISKIMAGE>
-  <comment>
-    $FreeBSD$
-    A Solaris 8 disklabel
-  </comment>
-  <sectorsize>512</sectorsize>
-  <mediasize>0</mediasize>
-  <fwsectors>0</fwsectors>
-  <fwheads>0</fwheads>
-  <fwcylinders>0</fwcylinders>
-  <sector>
-    <offset>0</offset>
-    <hexdata>
-	49424d2d444459532d5433363935304d2d533936482063796c20313439373020
-	616c742032206864203132207365632033393900000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000100000000000000000008000200000003000100050000000000000000
-	0000000000000000000000080000003f000000000000000000000000600ddeee
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000027103a7c00000000000000013a7a0002000c018f00000000000000dc
-	002d96c000000000001012b0000000000445b1c8000000000000000000000000
-	00000000000000000000000000000000000000000000034c04080858dabe5ec8
-    </hexdata>
-  </sector>
-</DISKIMAGE>
diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/tools/regression/geom/Data/disk.sun.da1.xml
deleted file mode 100644
index 0aac8e584d4a..000000000000
--- a/tools/regression/geom/Data/disk.sun.da1.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<DISKIMAGE>
-  <comment>
-    $FreeBSD$	
-    A Solaris 8 disklabel
-  </comment>
-  <sectorsize>512</sectorsize>
-  <mediasize>0</mediasize>
-  <fwsectors>0</fwsectors>
-  <fwheads>0</fwheads>
-  <fwcylinders>0</fwcylinders>
-  <sector>
-    <offset>0</offset>
-    <hexdata>
-	53554e3138472063796c203735303620616c7420322068642031392073656320
-	3234380000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000170686b00000000000008000200000003000100050000000800010000
-	00000007000000040000000800000000000000000000000000000000600ddeee
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	0000000000000000000000000000000000000000000000000000000000000000
-	000000001c201d5400000000000000011d520002001300f80000000000000000
-	0007d6480000006d0020113000000000021bad5000000b4e014b873800000000
-	000000000000022b00400ff8000005a600400ff80000092100280c48dabe971e
-    </hexdata>
-  </sector>
-</DISKIMAGE>
diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/tools/regression/geom/Ref/disk.alpha.da0.xml
deleted file mode 100644
index a300f0d5734d..000000000000
--- a/tools/regression/geom/Ref/disk.alpha.da0.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-$FreeBSD$
-/dev/md34	512	5120	10
-/dev/md34a	512	251658240	491520
-/dev/md34b	512	1086291968	2121664
-/dev/md34c	512	18309995520	35761710
-/dev/md34e	512	20971520	40960
-/dev/md34f	512	16951073792	33107566
diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/tools/regression/geom/Ref/disk.alpha2.da0.xml
deleted file mode 100644
index 7ef7573e729e..000000000000
--- a/tools/regression/geom/Ref/disk.alpha2.da0.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-$FreeBSD$
-/dev/md34	512	5120	10
-/dev/md34a	512	24675840	48195
-/dev/md34b	512	4178442240	8161020
-/dev/md34c	512	74027520	144585
diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/tools/regression/geom/Ref/disk.pc98.wdc0.xml
deleted file mode 100644
index 5ffb0c98d86f..000000000000
--- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-$FreeBSD$
-/dev/md34	512	75264	147	1	8	17
-/dev/md34s1	512	1626603520	3176960	23360	8	17
-/dev/md34s1a	512	78643200	153600	1129	8	17
-/dev/md34s1b	512	104857600	204800	1505	8	17
-/dev/md34s1c	512	1626603520	3176960	23360	8	17
-/dev/md34s1e	512	52428800	102400	752	8	17
-/dev/md34s1f	512	1390673920	2716160	19971	8	17
diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/tools/regression/geom/Ref/disk.sun.da0.xml
deleted file mode 100644
index 15b97c821b12..000000000000
--- a/tools/regression/geom/Ref/disk.sun.da0.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-$FreeBSD$
-/dev/md34	512	5120	10
-/dev/md34a	512	1529708544	2987712
-/dev/md34b	512	539320320	1053360
-/dev/md34c	512	36698296320	71676360
-/dev/md34h	512	34629267456	67635288
diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/tools/regression/geom/Ref/disk.sun.da1.xml
deleted file mode 100644
index 004771be96e7..000000000000
--- a/tools/regression/geom/Ref/disk.sun.da1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-$FreeBSD$
-/dev/md34	512	5120	10
-/dev/md34a	512	262967296	513608
-/dev/md34b	512	1075994624	2101552
-/dev/md34c	512	18108555264	35368272
-/dev/md34d	512	11124240384	21727032
-/dev/md34f	512	2149576704	4198392
-/dev/md34g	512	2149576704	4198392
-/dev/md34h	512	1343787008	2624584