summaryrefslogtreecommitdiffstats
path: root/tools/regression
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-05-21 20:42:51 +0000
committerphk <phk@FreeBSD.org>2002-05-21 20:42:51 +0000
commit715c35adadcc4804b9b8abab2e4f86a59606d599 (patch)
treec83570a598efef06fa500910462c879c1702b361 /tools/regression
parentfd74bc1d8e5662fd92475219e1328528de5e2ad4 (diff)
downloadFreeBSD-src-715c35adadcc4804b9b8abab2e4f86a59606d599.zip
FreeBSD-src-715c35adadcc4804b9b8abab2e4f86a59606d599.tar.gz
Update to match kernel side.
Sponsored by: DARPA & NAI Labs.
Diffstat (limited to 'tools/regression')
-rw-r--r--tools/regression/geom/Test/Makefile2
-rw-r--r--tools/regression/geom/Test/T000/ref.conf16
-rw-r--r--tools/regression/geom/Test/T001/ref.conf332
-rw-r--r--tools/regression/geom/Test/T002/ref.conf90
-rw-r--r--tools/regression/geom/Test/T003/ref.conf422
-rw-r--r--tools/regression/geom/Test/T004/ref.conf222
-rw-r--r--tools/regression/geom/Test/T005/ref.conf110
-rw-r--r--tools/regression/geom/Test/T006/ref.conf34
-rw-r--r--tools/regression/geom/Test/T007/ref.conf16
-rw-r--r--tools/regression/geom/Test/T008/ref.conf16
-rw-r--r--tools/regression/geom/Test/T009/ref.conf16
-rw-r--r--tools/regression/geom/Test/T010/ref.conf72
-rw-r--r--tools/regression/geom/Test/T011/ref.conf34
-rw-r--r--tools/regression/geom/Test/T012/ref.conf242
-rw-r--r--tools/regression/geom/Test/T013/ref.conf308
-rw-r--r--tools/regression/geom/Test/T014/ref.conf126
16 files changed, 1152 insertions, 906 deletions
diff --git a/tools/regression/geom/Test/Makefile b/tools/regression/geom/Test/Makefile
index 463c6ab..602334f 100644
--- a/tools/regression/geom/Test/Makefile
+++ b/tools/regression/geom/Test/Makefile
@@ -8,3 +8,5 @@ SUBDIR+= T010 T011 T012 T013 T014
.include <bsd.subdir.mk>
test: _SUBDIR
+
+mkref: _SUBDIR
diff --git a/tools/regression/geom/Test/T000/ref.conf b/tools/regression/geom/Test/T000/ref.conf
index 37df706..211f608 100644
--- a/tools/regression/geom/Test/T000/ref.conf
+++ b/tools/regression/geom/Test/T000/ref.conf
@@ -1,18 +1,18 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x805bf20">
+ <class id="0x805bfc0">
<name>DEV-class</name>
</class>
- <class id="0x805bf00">
- <name>MBREXT-class</name>
+ <class id="0x805bfa0">
+ <name>MBREXT</name>
</class>
- <class id="0x805bee0">
- <name>MBR-class</name>
+ <class id="0x805bf80">
+ <name>MBR</name>
</class>
- <class id="0x805bf40">
- <name>BSD-class</name>
+ <class id="0x805bfe0">
+ <name>BSD</name>
</class>
- <class id="0x805be40">
+ <class id="0x805bee0">
<name>SIMDISK-class</name>
</class>
</mesh>
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 3cc2245..264304d 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -1,159 +1,177 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073560">
+ <class id="0x8072400">
<name>DEV-class</name>
- <geom id="0x80c1c80">
- <class ref="0x8073560"/>
+ <geom id="0x80bfe80">
+ <class ref="0x8072400"/>
<name>ad0s3d</name>
<rank>4</rank>
- <consumer id="0x80b9440">
- <geom ref="0x80c1c80"/>
- <provider ref="0x80c1100"/>
+ <consumer id="0x80b8440">
+ <geom ref="0x80bfe80"/>
+ <provider ref="0x80bf300"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1b00">
- <class ref="0x8073560"/>
+ <geom id="0x80bfd00">
+ <class ref="0x8072400"/>
<name>ad0s3c</name>
<rank>4</rank>
- <consumer id="0x80b9400">
- <geom ref="0x80c1b00"/>
- <provider ref="0x80c1080"/>
+ <consumer id="0x80b8400">
+ <geom ref="0x80bfd00"/>
+ <provider ref="0x80bf280"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1980">
- <class ref="0x8073560"/>
+ <geom id="0x80bfb80">
+ <class ref="0x8072400"/>
<name>ad0s3a</name>
<rank>4</rank>
- <consumer id="0x80b93c0">
- <geom ref="0x80c1980"/>
- <provider ref="0x80c1000"/>
+ <consumer id="0x80b83c0">
+ <geom ref="0x80bfb80"/>
+ <provider ref="0x80bf200"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1800">
- <class ref="0x8073560"/>
+ <geom id="0x80bfa00">
+ <class ref="0x8072400"/>
<name>ad0s2c</name>
<rank>4</rank>
- <consumer id="0x80b9380">
- <geom ref="0x80c1800"/>
- <provider ref="0x80bbd00"/>
+ <consumer id="0x80b8380">
+ <geom ref="0x80bfa00"/>
+ <provider ref="0x80bce80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1680">
- <class ref="0x8073560"/>
+ <geom id="0x80bf880">
+ <class ref="0x8072400"/>
<name>ad0s1f</name>
<rank>4</rank>
- <consumer id="0x80b9340">
- <geom ref="0x80c1680"/>
- <provider ref="0x80bba00"/>
+ <consumer id="0x80b8340">
+ <geom ref="0x80bf880"/>
+ <provider ref="0x80bcb00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1500">
- <class ref="0x8073560"/>
+ <geom id="0x80bf700">
+ <class ref="0x8072400"/>
<name>ad0s1e</name>
<rank>4</rank>
- <consumer id="0x80b9300">
- <geom ref="0x80c1500"/>
- <provider ref="0x80bb980"/>
+ <consumer id="0x80b8300">
+ <geom ref="0x80bf700"/>
+ <provider ref="0x80bca80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1380">
- <class ref="0x8073560"/>
+ <geom id="0x80bf580">
+ <class ref="0x8072400"/>
<name>ad0s1c</name>
<rank>4</rank>
- <consumer id="0x80b92c0">
- <geom ref="0x80c1380"/>
- <provider ref="0x80bb900"/>
+ <consumer id="0x80b82c0">
+ <geom ref="0x80bf580"/>
+ <provider ref="0x80bca00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1200">
- <class ref="0x8073560"/>
+ <geom id="0x80bf400">
+ <class ref="0x8072400"/>
<name>ad0s1b</name>
<rank>4</rank>
- <consumer id="0x80b9280">
- <geom ref="0x80c1200"/>
- <provider ref="0x80bb880"/>
+ <consumer id="0x80b8280">
+ <geom ref="0x80bf400"/>
+ <provider ref="0x80bc980"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1180">
- <class ref="0x8073560"/>
+ <geom id="0x80bf380">
+ <class ref="0x8072400"/>
<name>ad0s1a</name>
<rank>4</rank>
- <consumer id="0x80b9240">
- <geom ref="0x80c1180"/>
- <provider ref="0x80bb800"/>
+ <consumer id="0x80b8240">
+ <geom ref="0x80bf380"/>
+ <provider ref="0x80bc900"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbd80">
- <class ref="0x8073560"/>
+ <geom id="0x80bcf00">
+ <class ref="0x8072400"/>
<name>ad0s3</name>
<rank>3</rank>
- <consumer id="0x80b91c0">
- <geom ref="0x80bbd80"/>
- <provider ref="0x80bb480"/>
+ <consumer id="0x80b81c0">
+ <geom ref="0x80bcf00"/>
+ <provider ref="0x80bc480"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bba80">
- <class ref="0x8073560"/>
+ <geom id="0x80bcb80">
+ <class ref="0x8072400"/>
<name>ad0s2</name>
<rank>3</rank>
- <consumer id="0x80b9140">
- <geom ref="0x80bba80"/>
- <provider ref="0x80bb400"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80bcb80"/>
+ <provider ref="0x80bc400"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb500">
- <class ref="0x8073560"/>
+ <geom id="0x80bc580">
+ <class ref="0x8072400"/>
<name>ad0s1</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bb500"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80bc580"/>
+ <provider ref="0x80bc380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb100">
- <class ref="0x8073560"/>
+ <geom id="0x80bc100">
+ <class ref="0x8072400"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80bb100"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80bc100"/>
+ <provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073540">
- <name>MBREXT-class</name>
+ <class id="0x80723e0">
+ <name>MBREXT</name>
</class>
- <class id="0x8073520">
- <name>MBR-class</name>
- <geom id="0x80bb180">
- <class ref="0x8073520"/>
+ <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>signatur</name>
+ <offset>510</offset>
+ <length>2</length>
+ <flags>0</flags>
+ </magicspace>
<config>
<frontstuff>0</frontstuff>
</config>
- <consumer id="0x80b9080">
- <geom ref="0x80bb180"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80bc180"/>
+ <provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bb480">
- <geom ref="0x80bb180"/>
+ <provider id="0x80bc480">
+ <geom ref="0x80bc180"/>
<mode>r0w0e0</mode>
<name>ad0s3</name>
<config>
@@ -165,8 +183,8 @@
<type>165</type>
</config>
</provider>
- <provider id="0x80bb400">
- <geom ref="0x80bb180"/>
+ <provider id="0x80bc400">
+ <geom ref="0x80bc180"/>
<mode>r0w0e0</mode>
<name>ad0s2</name>
<config>
@@ -178,8 +196,8 @@
<type>165</type>
</config>
</provider>
- <provider id="0x80bb380">
- <geom ref="0x80bb180"/>
+ <provider id="0x80bc380">
+ <geom ref="0x80bc180"/>
<mode>r0w0e0</mode>
<name>ad0s1</name>
<config>
@@ -193,25 +211,49 @@
</provider>
</geom>
</class>
- <class id="0x8073580">
- <name>BSD-class</name>
- <geom id="0x80bbe00">
- <class ref="0x8073580"/>
+ <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="0x80b9200">
- <geom ref="0x80bbe00"/>
- <provider ref="0x80bb480"/>
+ <consumer id="0x80b8200">
+ <geom ref="0x80bcf80"/>
+ <provider ref="0x80bc480"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80c1100">
- <geom ref="0x80bbe00"/>
+ <provider id="0x80bf300">
+ <geom ref="0x80bcf80"/>
<mode>r0w0e0</mode>
<name>ad0s3d</name>
<config>
@@ -222,8 +264,8 @@
<secoffset>4096000</secoffset>
</config>
</provider>
- <provider id="0x80c1080">
- <geom ref="0x80bbe00"/>
+ <provider id="0x80bf280">
+ <geom ref="0x80bcf80"/>
<mode>r0w0e0</mode>
<name>ad0s3c</name>
<config>
@@ -234,8 +276,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80c1000">
- <geom ref="0x80bbe00"/>
+ <provider id="0x80bf200">
+ <geom ref="0x80bcf80"/>
<mode>r0w0e0</mode>
<name>ad0s3a</name>
<config>
@@ -247,23 +289,47 @@
</config>
</provider>
</geom>
- <geom id="0x80bbb00">
- <class ref="0x8073580"/>
+ <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="0x80b9180">
- <geom ref="0x80bbb00"/>
- <provider ref="0x80bb400"/>
+ <consumer id="0x80b8180">
+ <geom ref="0x80bcc00"/>
+ <provider ref="0x80bc400"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bbd00">
- <geom ref="0x80bbb00"/>
+ <provider id="0x80bce80">
+ <geom ref="0x80bcc00"/>
<mode>r0w0e0</mode>
<name>ad0s2c</name>
<config>
@@ -275,23 +341,47 @@
</config>
</provider>
</geom>
- <geom id="0x80bb580">
- <class ref="0x8073580"/>
+ <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="0x80b9100">
- <geom ref="0x80bb580"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80bc600"/>
+ <provider ref="0x80bc380"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bba00">
- <geom ref="0x80bb580"/>
+ <provider id="0x80bcb00">
+ <geom ref="0x80bc600"/>
<mode>r0w0e0</mode>
<name>ad0s1f</name>
<config>
@@ -302,8 +392,8 @@
<secoffset>2252800</secoffset>
</config>
</provider>
- <provider id="0x80bb980">
- <geom ref="0x80bb580"/>
+ <provider id="0x80bca80">
+ <geom ref="0x80bc600"/>
<mode>r0w0e0</mode>
<name>ad0s1e</name>
<config>
@@ -314,8 +404,8 @@
<secoffset>1228800</secoffset>
</config>
</provider>
- <provider id="0x80bb900">
- <geom ref="0x80bb580"/>
+ <provider id="0x80bca00">
+ <geom ref="0x80bc600"/>
<mode>r0w0e0</mode>
<name>ad0s1c</name>
<config>
@@ -326,8 +416,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb880">
- <geom ref="0x80bb580"/>
+ <provider id="0x80bc980">
+ <geom ref="0x80bc600"/>
<mode>r0w0e0</mode>
<name>ad0s1b</name>
<config>
@@ -338,8 +428,8 @@
<secoffset>204800</secoffset>
</config>
</provider>
- <provider id="0x80bb800">
- <geom ref="0x80bb580"/>
+ <provider id="0x80bc900">
+ <geom ref="0x80bc600"/>
<mode>r0w0e0</mode>
<name>ad0s1a</name>
<config>
@@ -352,14 +442,14 @@
</provider>
</geom>
</class>
- <class id="0x8073480">
+ <class id="0x8072320">
<name>SIMDISK-class</name>
- <geom id="0x80bb000">
- <class ref="0x8073480"/>
+ <geom id="0x80bc000">
+ <class ref="0x8072320"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bb080">
- <geom ref="0x80bb000"/>
+ <provider id="0x80bc080">
+ <geom ref="0x80bc000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index 7c7b63a..849ca57 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -1,59 +1,77 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073560">
+ <class id="0x8072400">
<name>DEV-class</name>
- <geom id="0x80ba500">
- <class ref="0x8073560"/>
+ <geom id="0x80b9580">
+ <class ref="0x8072400"/>
<name>ad0s2</name>
<rank>3</rank>
- <consumer id="0x80b9100">
- <geom ref="0x80ba500"/>
- <provider ref="0x80ba400"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80b9580"/>
+ <provider ref="0x80b9400"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80ba480">
- <class ref="0x8073560"/>
+ <geom id="0x80b9500">
+ <class ref="0x8072400"/>
<name>ad0s1</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80ba480"/>
- <provider ref="0x80ba380"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80b9500"/>
+ <provider ref="0x80b9380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80ba100">
- <class ref="0x8073560"/>
+ <geom id="0x80b9100">
+ <class ref="0x8072400"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80ba100"/>
- <provider ref="0x80ba080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80b9100"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073540">
- <name>MBREXT-class</name>
+ <class id="0x80723e0">
+ <name>MBREXT</name>
</class>
- <class id="0x8073520">
- <name>MBR-class</name>
- <geom id="0x80ba180">
- <class ref="0x8073520"/>
+ <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>signatur</name>
+ <offset>510</offset>
+ <length>2</length>
+ <flags>0</flags>
+ </magicspace>
<config>
<frontstuff>0</frontstuff>
</config>
- <consumer id="0x80b9080">
- <geom ref="0x80ba180"/>
- <provider ref="0x80ba080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80b9180"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80ba400">
- <geom ref="0x80ba180"/>
+ <provider id="0x80b9400">
+ <geom ref="0x80b9180"/>
<mode>r0w0e0</mode>
<name>ad0s2</name>
<config>
@@ -65,8 +83,8 @@
<type>11</type>
</config>
</provider>
- <provider id="0x80ba380">
- <geom ref="0x80ba180"/>
+ <provider id="0x80b9380">
+ <geom ref="0x80b9180"/>
<mode>r0w0e0</mode>
<name>ad0s1</name>
<config>
@@ -80,17 +98,17 @@
</provider>
</geom>
</class>
- <class id="0x8073580">
- <name>BSD-class</name>
+ <class id="0x8072420">
+ <name>BSD</name>
</class>
- <class id="0x8073480">
+ <class id="0x8072320">
<name>SIMDISK-class</name>
- <geom id="0x80ba000">
- <class ref="0x8073480"/>
+ <geom id="0x80b9000">
+ <class ref="0x8072320"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80ba080">
- <geom ref="0x80ba000"/>
+ <provider id="0x80b9080">
+ <geom ref="0x80b9000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index cdc8d6e..9114a6e 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -1,286 +1,286 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073560">
+ <class id="0x8072400">
<name>DEV-class</name>
- <geom id="0x80cb500">
- <class ref="0x8073560"/>
+ <geom id="0x80ca580">
+ <class ref="0x8072400"/>
<name>ad0s27</name>
<rank>4</rank>
- <consumer id="0x80b9700">
- <geom ref="0x80cb500"/>
- <provider ref="0x80be380"/>
+ <consumer id="0x80b8700">
+ <geom ref="0x80ca580"/>
+ <provider ref="0x80c3400"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80cb380">
- <class ref="0x8073560"/>
+ <geom id="0x80ca400">
+ <class ref="0x8072400"/>
<name>ad0s26</name>
<rank>4</rank>
- <consumer id="0x80b96c0">
- <geom ref="0x80cb380"/>
- <provider ref="0x80be300"/>
+ <consumer id="0x80b86c0">
+ <geom ref="0x80ca400"/>
+ <provider ref="0x80c3380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80cb200">
- <class ref="0x8073560"/>
+ <geom id="0x80ca280">
+ <class ref="0x8072400"/>
<name>ad0s25</name>
<rank>4</rank>
- <consumer id="0x80b9680">
- <geom ref="0x80cb200"/>
- <provider ref="0x80be280"/>
+ <consumer id="0x80b8680">
+ <geom ref="0x80ca280"/>
+ <provider ref="0x80c3300"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80cb080">
- <class ref="0x8073560"/>
+ <geom id="0x80ca100">
+ <class ref="0x8072400"/>
<name>ad0s24</name>
<rank>4</rank>
- <consumer id="0x80b9640">
- <geom ref="0x80cb080"/>
- <provider ref="0x80be200"/>
+ <consumer id="0x80b8640">
+ <geom ref="0x80ca100"/>
+ <provider ref="0x80c3280"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1f00">
- <class ref="0x8073560"/>
+ <geom id="0x80c5f80">
+ <class ref="0x8072400"/>
<name>ad0s23</name>
<rank>4</rank>
- <consumer id="0x80b9600">
- <geom ref="0x80c1f00"/>
- <provider ref="0x80be180"/>
+ <consumer id="0x80b8600">
+ <geom ref="0x80c5f80"/>
+ <provider ref="0x80c3200"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1d80">
- <class ref="0x8073560"/>
+ <geom id="0x80c5e00">
+ <class ref="0x8072400"/>
<name>ad0s22</name>
<rank>4</rank>
- <consumer id="0x80b95c0">
- <geom ref="0x80c1d80"/>
- <provider ref="0x80be100"/>
+ <consumer id="0x80b85c0">
+ <geom ref="0x80c5e00"/>
+ <provider ref="0x80c3180"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1c00">
- <class ref="0x8073560"/>
+ <geom id="0x80c5c80">
+ <class ref="0x8072400"/>
<name>ad0s21</name>
<rank>4</rank>
- <consumer id="0x80b9580">
- <geom ref="0x80c1c00"/>
- <provider ref="0x80be080"/>
+ <consumer id="0x80b8580">
+ <geom ref="0x80c5c80"/>
+ <provider ref="0x80c3100"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1a80">
- <class ref="0x8073560"/>
+ <geom id="0x80c5b00">
+ <class ref="0x8072400"/>
<name>ad0s20</name>
<rank>4</rank>
- <consumer id="0x80b9540">
- <geom ref="0x80c1a80"/>
- <provider ref="0x80be000"/>
+ <consumer id="0x80b8540">
+ <geom ref="0x80c5b00"/>
+ <provider ref="0x80c3080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1900">
- <class ref="0x8073560"/>
+ <geom id="0x80c5980">
+ <class ref="0x8072400"/>
<name>ad0s19</name>
<rank>4</rank>
- <consumer id="0x80b9500">
- <geom ref="0x80c1900"/>
- <provider ref="0x80bbf80"/>
+ <consumer id="0x80b8500">
+ <geom ref="0x80c5980"/>
+ <provider ref="0x80c3000"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1780">
- <class ref="0x8073560"/>
+ <geom id="0x80c5800">
+ <class ref="0x8072400"/>
<name>ad0s18</name>
<rank>4</rank>
- <consumer id="0x80b94c0">
- <geom ref="0x80c1780"/>
- <provider ref="0x80bbf00"/>
+ <consumer id="0x80b84c0">
+ <geom ref="0x80c5800"/>
+ <provider ref="0x80c0f80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1600">
- <class ref="0x8073560"/>
+ <geom id="0x80c5680">
+ <class ref="0x8072400"/>
<name>ad0s17</name>
<rank>4</rank>
- <consumer id="0x80b9480">
- <geom ref="0x80c1600"/>
- <provider ref="0x80bbe80"/>
+ <consumer id="0x80b8480">
+ <geom ref="0x80c5680"/>
+ <provider ref="0x80c0f00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1480">
- <class ref="0x8073560"/>
+ <geom id="0x80c5500">
+ <class ref="0x8072400"/>
<name>ad0s16</name>
<rank>4</rank>
- <consumer id="0x80b9440">
- <geom ref="0x80c1480"/>
- <provider ref="0x80bbe00"/>
+ <consumer id="0x80b8440">
+ <geom ref="0x80c5500"/>
+ <provider ref="0x80c0e80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1300">
- <class ref="0x8073560"/>
+ <geom id="0x80c5380">
+ <class ref="0x8072400"/>
<name>ad0s15</name>
<rank>4</rank>
- <consumer id="0x80b9400">
- <geom ref="0x80c1300"/>
- <provider ref="0x80bbd80"/>
+ <consumer id="0x80b8400">
+ <geom ref="0x80c5380"/>
+ <provider ref="0x80c0e00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1180">
- <class ref="0x8073560"/>
+ <geom id="0x80c5200">
+ <class ref="0x8072400"/>
<name>ad0s14</name>
<rank>4</rank>
- <consumer id="0x80b93c0">
- <geom ref="0x80c1180"/>
- <provider ref="0x80bbd00"/>
+ <consumer id="0x80b83c0">
+ <geom ref="0x80c5200"/>
+ <provider ref="0x80c0d80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c1000">
- <class ref="0x8073560"/>
+ <geom id="0x80c5080">
+ <class ref="0x8072400"/>
<name>ad0s13</name>
<rank>4</rank>
- <consumer id="0x80b9380">
- <geom ref="0x80c1000"/>
- <provider ref="0x80bbc80"/>
+ <consumer id="0x80b8380">
+ <geom ref="0x80c5080"/>
+ <provider ref="0x80c0d00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bee80">
- <class ref="0x8073560"/>
+ <geom id="0x80c3f00">
+ <class ref="0x8072400"/>
<name>ad0s12</name>
<rank>4</rank>
- <consumer id="0x80b9340">
- <geom ref="0x80bee80"/>
- <provider ref="0x80bbc00"/>
+ <consumer id="0x80b8340">
+ <geom ref="0x80c3f00"/>
+ <provider ref="0x80c0c80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bed00">
- <class ref="0x8073560"/>
+ <geom id="0x80c3d80">
+ <class ref="0x8072400"/>
<name>ad0s11</name>
<rank>4</rank>
- <consumer id="0x80b9300">
- <geom ref="0x80bed00"/>
- <provider ref="0x80bbb80"/>
+ <consumer id="0x80b8300">
+ <geom ref="0x80c3d80"/>
+ <provider ref="0x80c0c00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80beb80">
- <class ref="0x8073560"/>
+ <geom id="0x80c3c00">
+ <class ref="0x8072400"/>
<name>ad0s10</name>
<rank>4</rank>
- <consumer id="0x80b92c0">
- <geom ref="0x80beb80"/>
- <provider ref="0x80bbb00"/>
+ <consumer id="0x80b82c0">
+ <geom ref="0x80c3c00"/>
+ <provider ref="0x80c0b80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bea00">
- <class ref="0x8073560"/>
+ <geom id="0x80c3a80">
+ <class ref="0x8072400"/>
<name>ad0s9</name>
<rank>4</rank>
- <consumer id="0x80b9280">
- <geom ref="0x80bea00"/>
- <provider ref="0x80bba80"/>
+ <consumer id="0x80b8280">
+ <geom ref="0x80c3a80"/>
+ <provider ref="0x80c0b00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80be880">
- <class ref="0x8073560"/>
+ <geom id="0x80c3900">
+ <class ref="0x8072400"/>
<name>ad0s8</name>
<rank>4</rank>
- <consumer id="0x80b9240">
- <geom ref="0x80be880"/>
- <provider ref="0x80bba00"/>
+ <consumer id="0x80b8240">
+ <geom ref="0x80c3900"/>
+ <provider ref="0x80c0a80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80be700">
- <class ref="0x8073560"/>
+ <geom id="0x80c3780">
+ <class ref="0x8072400"/>
<name>ad0s7</name>
<rank>4</rank>
- <consumer id="0x80b9200">
- <geom ref="0x80be700"/>
- <provider ref="0x80bb980"/>
+ <consumer id="0x80b8200">
+ <geom ref="0x80c3780"/>
+ <provider ref="0x80c0a00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80be580">
- <class ref="0x8073560"/>
+ <geom id="0x80c3600">
+ <class ref="0x8072400"/>
<name>ad0s6</name>
<rank>4</rank>
- <consumer id="0x80b91c0">
- <geom ref="0x80be580"/>
- <provider ref="0x80bb900"/>
+ <consumer id="0x80b81c0">
+ <geom ref="0x80c3600"/>
+ <provider ref="0x80c0980"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80be400">
- <class ref="0x8073560"/>
+ <geom id="0x80c3480">
+ <class ref="0x8072400"/>
<name>ad0s5</name>
<rank>4</rank>
- <consumer id="0x80b9180">
- <geom ref="0x80be400"/>
- <provider ref="0x80bb880"/>
+ <consumer id="0x80b8180">
+ <geom ref="0x80c3480"/>
+ <provider ref="0x80c0900"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb500">
- <class ref="0x8073560"/>
+ <geom id="0x80c0580">
+ <class ref="0x8072400"/>
<name>ad0s2</name>
<rank>3</rank>
- <consumer id="0x80b9100">
- <geom ref="0x80bb500"/>
- <provider ref="0x80bb400"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80c0580"/>
+ <provider ref="0x80c0400"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb480">
- <class ref="0x8073560"/>
+ <geom id="0x80c0500">
+ <class ref="0x8072400"/>
<name>ad0s1</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bb480"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80c0500"/>
+ <provider ref="0x80c0380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb100">
- <class ref="0x8073560"/>
+ <geom id="0x80c0100">
+ <class ref="0x8072400"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80bb100"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80c0100"/>
+ <provider ref="0x80c0080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073540">
- <name>MBREXT-class</name>
- <geom id="0x80bb700">
- <class ref="0x8073540"/>
+ <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="0x80b9140">
- <geom ref="0x80bb700"/>
- <provider ref="0x80bb400"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80c0780"/>
+ <provider ref="0x80c0400"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80be380">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3400">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s27</name>
<config>
@@ -292,8 +292,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be300">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3380">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s26</name>
<config>
@@ -305,8 +305,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be280">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3300">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s25</name>
<config>
@@ -318,8 +318,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be200">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3280">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s24</name>
<config>
@@ -331,8 +331,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be180">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3200">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s23</name>
<config>
@@ -344,8 +344,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be100">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3180">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s22</name>
<config>
@@ -357,8 +357,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be080">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3100">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s21</name>
<config>
@@ -370,8 +370,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80be000">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3080">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s20</name>
<config>
@@ -383,8 +383,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbf80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c3000">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s19</name>
<config>
@@ -396,8 +396,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbf00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0f80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s18</name>
<config>
@@ -409,8 +409,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbe80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0f00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s17</name>
<config>
@@ -422,8 +422,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbe00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0e80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s16</name>
<config>
@@ -435,8 +435,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbd80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0e00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s15</name>
<config>
@@ -448,8 +448,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbd00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0d80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s14</name>
<config>
@@ -461,8 +461,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbc80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0d00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s13</name>
<config>
@@ -474,8 +474,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbc00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0c80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s12</name>
<config>
@@ -487,8 +487,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbb80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0c00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s11</name>
<config>
@@ -500,8 +500,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bbb00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0b80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s10</name>
<config>
@@ -513,8 +513,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bba80">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0b00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s9</name>
<config>
@@ -526,8 +526,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bba00">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0a80">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s8</name>
<config>
@@ -539,8 +539,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bb980">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0a00">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s7</name>
<config>
@@ -552,8 +552,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bb900">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0980">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s6</name>
<config>
@@ -565,8 +565,8 @@
<type>1</type>
</config>
</provider>
- <provider id="0x80bb880">
- <geom ref="0x80bb700"/>
+ <provider id="0x80c0900">
+ <geom ref="0x80c0780"/>
<mode>r0w0e0</mode>
<name>ad0s5</name>
<config>
@@ -580,24 +580,42 @@
</provider>
</geom>
</class>
- <class id="0x8073520">
- <name>MBR-class</name>
- <geom id="0x80bb180">
- <class ref="0x8073520"/>
+ <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>signatur</name>
+ <offset>510</offset>
+ <length>2</length>
+ <flags>0</flags>
+ </magicspace>
<config>
<frontstuff>0</frontstuff>
</config>
- <consumer id="0x80b9080">
- <geom ref="0x80bb180"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80c0180"/>
+ <provider ref="0x80c0080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bb400">
- <geom ref="0x80bb180"/>
+ <provider id="0x80c0400">
+ <geom ref="0x80c0180"/>
<mode>r0w0e0</mode>
<name>ad0s2</name>
<config>
@@ -609,8 +627,8 @@
<type>5</type>
</config>
</provider>
- <provider id="0x80bb380">
- <geom ref="0x80bb180"/>
+ <provider id="0x80c0380">
+ <geom ref="0x80c0180"/>
<mode>r0w0e0</mode>
<name>ad0s1</name>
<config>
@@ -624,17 +642,17 @@
</provider>
</geom>
</class>
- <class id="0x8073580">
- <name>BSD-class</name>
+ <class id="0x8072420">
+ <name>BSD</name>
</class>
- <class id="0x8073480">
+ <class id="0x8072320">
<name>SIMDISK-class</name>
- <geom id="0x80bb000">
- <class ref="0x8073480"/>
+ <geom id="0x80c0000">
+ <class ref="0x8072320"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bb080">
- <geom ref="0x80bb000"/>
+ <provider id="0x80c0080">
+ <geom ref="0x80c0000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index 8658edf..7e23838 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -1,129 +1,147 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073580">
+ <class id="0x8072420">
<name>DEV-class</name>
- <geom id="0x80bd480">
- <class ref="0x8073580"/>
+ <geom id="0x80be580">
+ <class ref="0x8072420"/>
<name>ad0s1h</name>
<rank>4</rank>
- <consumer id="0x80b9300">
- <geom ref="0x80bd480"/>
- <provider ref="0x80bba80"/>
+ <consumer id="0x80b8300">
+ <geom ref="0x80be580"/>
+ <provider ref="0x80bcb80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bd300">
- <class ref="0x8073580"/>
+ <geom id="0x80be400">
+ <class ref="0x8072420"/>
<name>ad0s1g</name>
<rank>4</rank>
- <consumer id="0x80b92c0">
- <geom ref="0x80bd300"/>
- <provider ref="0x80bba00"/>
+ <consumer id="0x80b82c0">
+ <geom ref="0x80be400"/>
+ <provider ref="0x80bcb00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bd180">
- <class ref="0x8073580"/>
+ <geom id="0x80be280">
+ <class ref="0x8072420"/>
<name>ad0s1f</name>
<rank>4</rank>
- <consumer id="0x80b9280">
- <geom ref="0x80bd180"/>
- <provider ref="0x80bb980"/>
+ <consumer id="0x80b8280">
+ <geom ref="0x80be280"/>
+ <provider ref="0x80bca80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bd000">
- <class ref="0x8073580"/>
+ <geom id="0x80be100">
+ <class ref="0x8072420"/>
<name>ad0s1e</name>
<rank>4</rank>
- <consumer id="0x80b9240">
- <geom ref="0x80bd000"/>
- <provider ref="0x80bb900"/>
+ <consumer id="0x80b8240">
+ <geom ref="0x80be100"/>
+ <provider ref="0x80bca00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbe80">
- <class ref="0x8073580"/>
+ <geom id="0x80bcf80">
+ <class ref="0x8072420"/>
<name>ad0s1d</name>
<rank>4</rank>
- <consumer id="0x80b9200">
- <geom ref="0x80bbe80"/>
- <provider ref="0x80bb880"/>
+ <consumer id="0x80b8200">
+ <geom ref="0x80bcf80"/>
+ <provider ref="0x80bc980"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbd00">
- <class ref="0x8073580"/>
+ <geom id="0x80bce00">
+ <class ref="0x8072420"/>
<name>ad0s1c</name>
<rank>4</rank>
- <consumer id="0x80b91c0">
- <geom ref="0x80bbd00"/>
- <provider ref="0x80bb800"/>
+ <consumer id="0x80b81c0">
+ <geom ref="0x80bce00"/>
+ <provider ref="0x80bc900"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbb80">
- <class ref="0x8073580"/>
+ <geom id="0x80bcc80">
+ <class ref="0x8072420"/>
<name>ad0s1b</name>
<rank>4</rank>
- <consumer id="0x80b9180">
- <geom ref="0x80bbb80"/>
- <provider ref="0x80bb780"/>
+ <consumer id="0x80b8180">
+ <geom ref="0x80bcc80"/>
+ <provider ref="0x80bc880"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbb00">
- <class ref="0x8073580"/>
+ <geom id="0x80bcc00">
+ <class ref="0x8072420"/>
<name>ad0s1a</name>
<rank>4</rank>
- <consumer id="0x80b9140">
- <geom ref="0x80bbb00"/>
- <provider ref="0x80bb700"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80bcc00"/>
+ <provider ref="0x80bc800"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb400">
- <class ref="0x8073580"/>
+ <geom id="0x80bc480">
+ <class ref="0x8072420"/>
<name>ad0s1</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bb400"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80bc480"/>
+ <provider ref="0x80bc380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb100">
- <class ref="0x8073580"/>
+ <geom id="0x80bc100">
+ <class ref="0x8072420"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80bb100"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80bc100"/>
+ <provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073560">
- <name>MBREXT-class</name>
+ <class id="0x8072400">
+ <name>MBREXT</name>
</class>
- <class id="0x8073540">
- <name>MBR-class</name>
- <geom id="0x80bb180">
- <class ref="0x8073540"/>
+ <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>signatur</name>
+ <offset>510</offset>
+ <length>2</length>
+ <flags>0</flags>
+ </magicspace>
<config>
<frontstuff>0</frontstuff>
</config>
- <consumer id="0x80b9080">
- <geom ref="0x80bb180"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80bc180"/>
+ <provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bb380">
- <geom ref="0x80bb180"/>
+ <provider id="0x80bc380">
+ <geom ref="0x80bc180"/>
<mode>r0w0e0</mode>
<name>ad0s1</name>
<config>
@@ -137,25 +155,49 @@
</provider>
</geom>
</class>
- <class id="0x80735a0">
- <name>BSD-class</name>
- <geom id="0x80bb480">
- <class ref="0x80735a0"/>
+ <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="0x80b9100">
- <geom ref="0x80bb480"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80bc500"/>
+ <provider ref="0x80bc380"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bba80">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bcb80">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1h</name>
<config>
@@ -166,8 +208,8 @@
<secoffset>19898368</secoffset>
</config>
</provider>
- <provider id="0x80bba00">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bcb00">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1g</name>
<config>
@@ -178,8 +220,8 @@
<secoffset>13606912</secoffset>
</config>
</provider>
- <provider id="0x80bb980">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bca80">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1f</name>
<config>
@@ -190,8 +232,8 @@
<secoffset>5218304</secoffset>
</config>
</provider>
- <provider id="0x80bb900">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bca00">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1e</name>
<config>
@@ -202,8 +244,8 @@
<secoffset>4194304</secoffset>
</config>
</provider>
- <provider id="0x80bb880">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bc980">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1d</name>
<config>
@@ -214,8 +256,8 @@
<secoffset>30384128</secoffset>
</config>
</provider>
- <provider id="0x80bb800">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bc900">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1c</name>
<config>
@@ -226,8 +268,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb780">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bc880">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1b</name>
<config>
@@ -238,8 +280,8 @@
<secoffset>2097152</secoffset>
</config>
</provider>
- <provider id="0x80bb700">
- <geom ref="0x80bb480"/>
+ <provider id="0x80bc800">
+ <geom ref="0x80bc500"/>
<mode>r0w0e0</mode>
<name>ad0s1a</name>
<config>
@@ -252,14 +294,14 @@
</provider>
</geom>
</class>
- <class id="0x80734a0">
+ <class id="0x8072340">
<name>SIMDISK-class</name>
- <geom id="0x80bb000">
- <class ref="0x80734a0"/>
+ <geom id="0x80bc000">
+ <class ref="0x8072340"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bb080">
- <geom ref="0x80bb000"/>
+ <provider id="0x80bc080">
+ <geom ref="0x80bc000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 762098f..697754b 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -1,73 +1,97 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073560">
+ <class id="0x8072400">
<name>DEV-class</name>
- <geom id="0x80ba700">
- <class ref="0x8073560"/>
+ <geom id="0x80b9780">
+ <class ref="0x8072400"/>
<name>ad0c</name>
<rank>3</rank>
- <consumer id="0x80b9140">
- <geom ref="0x80ba700"/>
- <provider ref="0x80ba480"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80b9780"/>
+ <provider ref="0x80b9500"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80ba580">
- <class ref="0x8073560"/>
+ <geom id="0x80b9600">
+ <class ref="0x8072400"/>
<name>ad0b</name>
<rank>3</rank>
- <consumer id="0x80b9100">
- <geom ref="0x80ba580"/>
- <provider ref="0x80ba400"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80b9600"/>
+ <provider ref="0x80b9480"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80ba500">
- <class ref="0x8073560"/>
+ <geom id="0x80b9580">
+ <class ref="0x8072400"/>
<name>ad0a</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80ba500"/>
- <provider ref="0x80ba380"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80b9580"/>
+ <provider ref="0x80b9400"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80ba100">
- <class ref="0x8073560"/>
+ <geom id="0x80b9100">
+ <class ref="0x8072400"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80ba100"/>
- <provider ref="0x80ba080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80b9100"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073540">
- <name>MBREXT-class</name>
+ <class id="0x80723e0">
+ <name>MBREXT</name>
</class>
- <class id="0x8073520">
- <name>MBR-class</name>
+ <class id="0x80723c0">
+ <name>MBR</name>
</class>
- <class id="0x8073580">
- <name>BSD-class</name>
- <geom id="0x80ba180">
- <class ref="0x8073580"/>
+ <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="0x80b9080">
- <geom ref="0x80ba180"/>
- <provider ref="0x80ba080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80b9180"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80ba480">
- <geom ref="0x80ba180"/>
+ <provider id="0x80b9500">
+ <geom ref="0x80b9180"/>
<mode>r0w0e0</mode>
<name>ad0c</name>
<config>
@@ -78,8 +102,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80ba400">
- <geom ref="0x80ba180"/>
+ <provider id="0x80b9480">
+ <geom ref="0x80b9180"/>
<mode>r0w0e0</mode>
<name>ad0b</name>
<config>
@@ -90,8 +114,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80ba380">
- <geom ref="0x80ba180"/>
+ <provider id="0x80b9400">
+ <geom ref="0x80b9180"/>
<mode>r0w0e0</mode>
<name>ad0a</name>
<config>
@@ -104,14 +128,14 @@
</provider>
</geom>
</class>
- <class id="0x8073480">
+ <class id="0x8072320">
<name>SIMDISK-class</name>
- <geom id="0x80ba000">
- <class ref="0x8073480"/>
+ <geom id="0x80b9000">
+ <class ref="0x8072320"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80ba080">
- <geom ref="0x80ba000"/>
+ <provider id="0x80b9080">
+ <geom ref="0x80b9000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T006/ref.conf b/tools/regression/geom/Test/T006/ref.conf
index 0318852..9d18a0f 100644
--- a/tools/regression/geom/Test/T006/ref.conf
+++ b/tools/regression/geom/Test/T006/ref.conf
@@ -1,35 +1,35 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073560">
+ <class id="0x8072400">
<name>DEV-class</name>
- <geom id="0x80ba100">
- <class ref="0x8073560"/>
+ <geom id="0x80b9100">
+ <class ref="0x8072400"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80ba100"/>
- <provider ref="0x80ba080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80b9100"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073540">
- <name>MBREXT-class</name>
+ <class id="0x80723e0">
+ <name>MBREXT</name>
</class>
- <class id="0x8073520">
- <name>MBR-class</name>
+ <class id="0x80723c0">
+ <name>MBR</name>
</class>
- <class id="0x8073580">
- <name>BSD-class</name>
+ <class id="0x8072420">
+ <name>BSD</name>
</class>
- <class id="0x8073480">
+ <class id="0x8072320">
<name>SIMDISK-class</name>
- <geom id="0x80ba000">
- <class ref="0x8073480"/>
+ <geom id="0x80b9000">
+ <class ref="0x8072320"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80ba080">
- <geom ref="0x80ba000"/>
+ <provider id="0x80b9080">
+ <geom ref="0x80b9000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T007/ref.conf b/tools/regression/geom/Test/T007/ref.conf
index c929573..98849b2 100644
--- a/tools/regression/geom/Test/T007/ref.conf
+++ b/tools/regression/geom/Test/T007/ref.conf
@@ -1,18 +1,18 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073580">
+ <class id="0x8072420">
<name>DEV-class</name>
</class>
- <class id="0x8073560">
- <name>MBREXT-class</name>
+ <class id="0x8072400">
+ <name>MBREXT</name>
</class>
- <class id="0x8073540">
- <name>MBR-class</name>
+ <class id="0x80723e0">
+ <name>MBR</name>
</class>
- <class id="0x80735a0">
- <name>BSD-class</name>
+ <class id="0x8072440">
+ <name>BSD</name>
</class>
- <class id="0x80734a0">
+ <class id="0x8072340">
<name>SIMDISK-class</name>
</class>
</mesh>
diff --git a/tools/regression/geom/Test/T008/ref.conf b/tools/regression/geom/Test/T008/ref.conf
index eec7f80..c480763 100644
--- a/tools/regression/geom/Test/T008/ref.conf
+++ b/tools/regression/geom/Test/T008/ref.conf
@@ -1,18 +1,18 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x80735a0">
+ <class id="0x8072460">
<name>DEV-class</name>
</class>
- <class id="0x8073580">
- <name>MBREXT-class</name>
+ <class id="0x8072440">
+ <name>MBREXT</name>
</class>
- <class id="0x8073560">
- <name>MBR-class</name>
+ <class id="0x8072420">
+ <name>MBR</name>
</class>
- <class id="0x80735c0">
- <name>BSD-class</name>
+ <class id="0x8072480">
+ <name>BSD</name>
</class>
- <class id="0x80734c0">
+ <class id="0x8072380">
<name>SIMDISK-class</name>
</class>
</mesh>
diff --git a/tools/regression/geom/Test/T009/ref.conf b/tools/regression/geom/Test/T009/ref.conf
index 7d9faf7..c59e0c0 100644
--- a/tools/regression/geom/Test/T009/ref.conf
+++ b/tools/regression/geom/Test/T009/ref.conf
@@ -1,18 +1,18 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073620">
+ <class id="0x80724e0">
<name>DEV-class</name>
</class>
- <class id="0x8073600">
- <name>MBREXT-class</name>
+ <class id="0x80724c0">
+ <name>MBREXT</name>
</class>
- <class id="0x80735e0">
- <name>MBR-class</name>
+ <class id="0x80724a0">
+ <name>MBR</name>
</class>
- <class id="0x8073640">
- <name>BSD-class</name>
+ <class id="0x8072500">
+ <name>BSD</name>
</class>
- <class id="0x8073540">
+ <class id="0x8072400">
<name>SIMDISK-class</name>
</class>
</mesh>
diff --git a/tools/regression/geom/Test/T010/ref.conf b/tools/regression/geom/Test/T010/ref.conf
index 77cc4b1..6d12ea4 100644
--- a/tools/regression/geom/Test/T010/ref.conf
+++ b/tools/regression/geom/Test/T010/ref.conf
@@ -1,73 +1,35 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x80735c0">
+ <class id="0x8072460">
<name>DEV-class</name>
- <geom id="0x80bc480">
- <class ref="0x80735c0"/>
- <name>ad0c</name>
- <rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bc480"/>
- <provider ref="0x80bc400"/>
- <mode>r0w0e0</mode>
- </consumer>
- </geom>
- <geom id="0x80bc180">
- <class ref="0x80735c0"/>
+ <geom id="0x80bb180">
+ <class ref="0x8072460"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80bc180"/>
- <provider ref="0x80bc100"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80bb180"/>
+ <provider ref="0x80bb100"/>
<mode>r1w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x80735a0">
- <name>MBREXT-class</name>
+ <class id="0x8072440">
+ <name>MBREXT</name>
</class>
- <class id="0x8073580">
- <name>MBR-class</name>
+ <class id="0x8072420">
+ <name>MBR</name>
</class>
- <class id="0x80735e0">
- <name>BSD-class</name>
- <geom id="0x80bc200">
- <class ref="0x80735e0"/>
- <name>ad0</name>
- <rank>2</rank>
- <config>
- <labeloffset>0</labeloffset>
- <frontstuff>0</frontstuff>
- </config>
- <consumer id="0x80b9080">
- <geom ref="0x80bc200"/>
- <provider ref="0x80bc100"/>
- <mode>r0w0e0</mode>
- <config>
- </config>
- </consumer>
- <provider id="0x80bc400">
- <geom ref="0x80bc200"/>
- <mode>r0w0e0</mode>
- <name>ad0c</name>
- <config>
- <index>2</index>
- <length>1474560</length>
- <seclength>2880</seclength>
- <offset>0</offset>
- <secoffset>0</secoffset>
- </config>
- </provider>
- </geom>
+ <class id="0x8072480">
+ <name>BSD</name>
</class>
- <class id="0x80734e0">
+ <class id="0x8072380">
<name>SIMDISK-class</name>
- <geom id="0x80bc080">
- <class ref="0x80734e0"/>
+ <geom id="0x80bb080">
+ <class ref="0x8072380"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bc100">
- <geom ref="0x80bc080"/>
+ <provider id="0x80bb100">
+ <geom ref="0x80bb080"/>
<mode>r1w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T011/ref.conf b/tools/regression/geom/Test/T011/ref.conf
index fd8d739..6d12ea4 100644
--- a/tools/regression/geom/Test/T011/ref.conf
+++ b/tools/regression/geom/Test/T011/ref.conf
@@ -1,35 +1,35 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x80735c0">
+ <class id="0x8072460">
<name>DEV-class</name>
- <geom id="0x80bc180">
- <class ref="0x80735c0"/>
+ <geom id="0x80bb180">
+ <class ref="0x8072460"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9040">
- <geom ref="0x80bc180"/>
- <provider ref="0x80bc100"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80bb180"/>
+ <provider ref="0x80bb100"/>
<mode>r1w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x80735a0">
- <name>MBREXT-class</name>
+ <class id="0x8072440">
+ <name>MBREXT</name>
</class>
- <class id="0x8073580">
- <name>MBR-class</name>
+ <class id="0x8072420">
+ <name>MBR</name>
</class>
- <class id="0x80735e0">
- <name>BSD-class</name>
+ <class id="0x8072480">
+ <name>BSD</name>
</class>
- <class id="0x80734e0">
+ <class id="0x8072380">
<name>SIMDISK-class</name>
- <geom id="0x80bc080">
- <class ref="0x80734e0"/>
+ <geom id="0x80bb080">
+ <class ref="0x8072380"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bc100">
- <geom ref="0x80bc080"/>
+ <provider id="0x80bb100">
+ <geom ref="0x80bb080"/>
<mode>r1w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T012/ref.conf b/tools/regression/geom/Test/T012/ref.conf
index 8f66b23..52f6297 100644
--- a/tools/regression/geom/Test/T012/ref.conf
+++ b/tools/regression/geom/Test/T012/ref.conf
@@ -1,23 +1,29 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073ae0">
- <name>SUNLABEL-class</name>
- <geom id="0x80bbd00">
- <class ref="0x8073ae0"/>
+ <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="0x80b9200">
- <geom ref="0x80bbd00"/>
- <provider ref="0x80bbc80"/>
+ <consumer id="0x80b8200">
+ <geom ref="0x80b9d00"/>
+ <provider ref="0x80b9c80"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80c2080">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80c1080">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0h</name>
<config>
@@ -28,8 +34,8 @@
<secoffset>11011944</secoffset>
</config>
</provider>
- <provider id="0x80c2000">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80c1000">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0g</name>
<config>
@@ -40,8 +46,8 @@
<secoffset>6813552</secoffset>
</config>
</provider>
- <provider id="0x80bbf80">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80b9f80">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0f</name>
<config>
@@ -52,8 +58,8 @@
<secoffset>2615160</secoffset>
</config>
</provider>
- <provider id="0x80bbf00">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80b9f00">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0d</name>
<config>
@@ -64,8 +70,8 @@
<secoffset>13636528</secoffset>
</config>
</provider>
- <provider id="0x80bbe80">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80b9e80">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0c</name>
<config>
@@ -76,8 +82,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bbe00">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80b9e00">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0b</name>
<config>
@@ -88,8 +94,8 @@
<secoffset>513608</secoffset>
</config>
</provider>
- <provider id="0x80bbd80">
- <geom ref="0x80bbd00"/>
+ <provider id="0x80b9d80">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>ad0a</name>
<config>
@@ -101,22 +107,28 @@
</config>
</provider>
</geom>
- <geom id="0x80bb100">
- <class ref="0x8073ae0"/>
+ <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="0x80b9040">
- <geom ref="0x80bb100"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8040">
+ <geom ref="0x80b9100"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bb380">
- <geom ref="0x80bb100"/>
+ <provider id="0x80b9380">
+ <geom ref="0x80b9100"/>
<mode>r0w0e0</mode>
<name>ad0h</name>
<config>
@@ -127,8 +139,8 @@
<secoffset>4041072</secoffset>
</config>
</provider>
- <provider id="0x80bb300">
- <geom ref="0x80bb100"/>
+ <provider id="0x80b9300">
+ <geom ref="0x80b9100"/>
<mode>r0w0e0</mode>
<name>ad0c</name>
<config>
@@ -139,8 +151,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb280">
- <geom ref="0x80bb100"/>
+ <provider id="0x80b9280">
+ <geom ref="0x80b9100"/>
<mode>r0w0e0</mode>
<name>ad0b</name>
<config>
@@ -151,8 +163,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb200">
- <geom ref="0x80bb100"/>
+ <provider id="0x80b9200">
+ <geom ref="0x80b9100"/>
<mode>r0w0e0</mode>
<name>ad0a</name>
<config>
@@ -165,166 +177,166 @@
</provider>
</geom>
</class>
- <class id="0x8073be0">
+ <class id="0x8072aa0">
<name>DEV-class</name>
- <geom id="0x80c2a80">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1a80">
+ <class ref="0x8072aa0"/>
<name>ad0h</name>
<rank>3</rank>
- <consumer id="0x80b9400">
- <geom ref="0x80c2a80"/>
- <provider ref="0x80c2080"/>
+ <consumer id="0x80b8400">
+ <geom ref="0x80c1a80"/>
+ <provider ref="0x80c1080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2900">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1900">
+ <class ref="0x8072aa0"/>
<name>ad0g</name>
<rank>3</rank>
- <consumer id="0x80b93c0">
- <geom ref="0x80c2900"/>
- <provider ref="0x80c2000"/>
+ <consumer id="0x80b83c0">
+ <geom ref="0x80c1900"/>
+ <provider ref="0x80c1000"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2780">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1780">
+ <class ref="0x8072aa0"/>
<name>ad0f</name>
<rank>3</rank>
- <consumer id="0x80b9380">
- <geom ref="0x80c2780"/>
- <provider ref="0x80bbf80"/>
+ <consumer id="0x80b8380">
+ <geom ref="0x80c1780"/>
+ <provider ref="0x80b9f80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2600">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1600">
+ <class ref="0x8072aa0"/>
<name>ad0d</name>
<rank>3</rank>
- <consumer id="0x80b9340">
- <geom ref="0x80c2600"/>
- <provider ref="0x80bbf00"/>
+ <consumer id="0x80b8340">
+ <geom ref="0x80c1600"/>
+ <provider ref="0x80b9f00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2480">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1480">
+ <class ref="0x8072aa0"/>
<name>ad0c</name>
<rank>3</rank>
- <consumer id="0x80b9300">
- <geom ref="0x80c2480"/>
- <provider ref="0x80bbe80"/>
+ <consumer id="0x80b8300">
+ <geom ref="0x80c1480"/>
+ <provider ref="0x80b9e80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2300">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1300">
+ <class ref="0x8072aa0"/>
<name>ad0b</name>
<rank>3</rank>
- <consumer id="0x80b92c0">
- <geom ref="0x80c2300"/>
- <provider ref="0x80bbe00"/>
+ <consumer id="0x80b82c0">
+ <geom ref="0x80c1300"/>
+ <provider ref="0x80b9e00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2180">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1180">
+ <class ref="0x8072aa0"/>
<name>ad0a</name>
<rank>3</rank>
- <consumer id="0x80b9280">
- <geom ref="0x80c2180"/>
- <provider ref="0x80bbd80"/>
+ <consumer id="0x80b8280">
+ <geom ref="0x80c1180"/>
+ <provider ref="0x80b9d80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c2100">
- <class ref="0x8073be0"/>
+ <geom id="0x80c1100">
+ <class ref="0x8072aa0"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9240">
- <geom ref="0x80c2100"/>
- <provider ref="0x80bbc80"/>
+ <consumer id="0x80b8240">
+ <geom ref="0x80c1100"/>
+ <provider ref="0x80b9c80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb980">
- <class ref="0x8073be0"/>
+ <geom id="0x80b9980">
+ <class ref="0x8072aa0"/>
<name>ad0h</name>
<rank>3</rank>
- <consumer id="0x80b9180">
- <geom ref="0x80bb980"/>
- <provider ref="0x80bb380"/>
+ <consumer id="0x80b8180">
+ <geom ref="0x80b9980"/>
+ <provider ref="0x80b9380"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb800">
- <class ref="0x8073be0"/>
+ <geom id="0x80b9800">
+ <class ref="0x8072aa0"/>
<name>ad0c</name>
<rank>3</rank>
- <consumer id="0x80b9140">
- <geom ref="0x80bb800"/>
- <provider ref="0x80bb300"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80b9800"/>
+ <provider ref="0x80b9300"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb600">
- <class ref="0x8073be0"/>
+ <geom id="0x80b9600">
+ <class ref="0x8072aa0"/>
<name>ad0b</name>
<rank>3</rank>
- <consumer id="0x80b9100">
- <geom ref="0x80bb600"/>
- <provider ref="0x80bb280"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80b9600"/>
+ <provider ref="0x80b9280"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb480">
- <class ref="0x8073be0"/>
+ <geom id="0x80b9480">
+ <class ref="0x8072aa0"/>
<name>ad0a</name>
<rank>3</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bb480"/>
- <provider ref="0x80bb200"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80b9480"/>
+ <provider ref="0x80b9200"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb400">
- <class ref="0x8073be0"/>
+ <geom id="0x80b9400">
+ <class ref="0x8072aa0"/>
<name>ad0</name>
<rank>2</rank>
- <consumer id="0x80b9080">
- <geom ref="0x80bb400"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8080">
+ <geom ref="0x80b9400"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073bc0">
- <name>MBREXT-class</name>
+ <class id="0x8072a80">
+ <name>MBREXT</name>
</class>
- <class id="0x8073ba0">
- <name>MBR-class</name>
+ <class id="0x8072a60">
+ <name>MBR</name>
</class>
- <class id="0x8073c00">
- <name>BSD-class</name>
+ <class id="0x8072ac0">
+ <name>BSD</name>
</class>
- <class id="0x8073b00">
+ <class id="0x80729c0">
<name>SIMDISK-class</name>
- <geom id="0x80bbb00">
- <class ref="0x8073b00"/>
+ <geom id="0x80b9b00">
+ <class ref="0x80729c0"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bbc80">
- <geom ref="0x80bbb00"/>
+ <provider id="0x80b9c80">
+ <geom ref="0x80b9b00"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
</geom>
- <geom id="0x80bb000">
- <class ref="0x8073b00"/>
+ <geom id="0x80b9000">
+ <class ref="0x80729c0"/>
<name>ad0</name>
<rank>1</rank>
- <provider id="0x80bb080">
- <geom ref="0x80bb000"/>
+ <provider id="0x80b9080">
+ <geom ref="0x80b9000"/>
<mode>r0w0e0</mode>
<name>ad0</name>
</provider>
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 68e9fe7..ebb3375 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,173 +1,191 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x8073600">
+ <class id="0x80724a0">
<name>DEV-class</name>
- <geom id="0x80c0d00">
- <class ref="0x8073600"/>
+ <geom id="0x80bee80">
+ <class ref="0x80724a0"/>
<name>da2c</name>
<rank>3</rank>
- <consumer id="0x80b94c0">
- <geom ref="0x80c0d00"/>
- <provider ref="0x80bbe80"/>
+ <consumer id="0x80b84c0">
+ <geom ref="0x80bee80"/>
+ <provider ref="0x80be000"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0b80">
- <class ref="0x8073600"/>
+ <geom id="0x80bed00">
+ <class ref="0x80724a0"/>
<name>da2b</name>
<rank>3</rank>
- <consumer id="0x80b9480">
- <geom ref="0x80c0b80"/>
- <provider ref="0x80bbe00"/>
+ <consumer id="0x80b8480">
+ <geom ref="0x80bed00"/>
+ <provider ref="0x80b9f80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0a00">
- <class ref="0x8073600"/>
+ <geom id="0x80beb80">
+ <class ref="0x80724a0"/>
<name>da2a</name>
<rank>3</rank>
- <consumer id="0x80b9440">
- <geom ref="0x80c0a00"/>
- <provider ref="0x80bbd80"/>
+ <consumer id="0x80b8440">
+ <geom ref="0x80beb80"/>
+ <provider ref="0x80b9f00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0880">
- <class ref="0x8073600"/>
+ <geom id="0x80bea00">
+ <class ref="0x80724a0"/>
<name>da1f</name>
<rank>3</rank>
- <consumer id="0x80b9400">
- <geom ref="0x80c0880"/>
- <provider ref="0x80bbb00"/>
+ <consumer id="0x80b8400">
+ <geom ref="0x80bea00"/>
+ <provider ref="0x80b9c00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0700">
- <class ref="0x8073600"/>
+ <geom id="0x80be880">
+ <class ref="0x80724a0"/>
<name>da1e</name>
<rank>3</rank>
- <consumer id="0x80b93c0">
- <geom ref="0x80c0700"/>
- <provider ref="0x80bba80"/>
+ <consumer id="0x80b83c0">
+ <geom ref="0x80be880"/>
+ <provider ref="0x80b9b80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0580">
- <class ref="0x8073600"/>
+ <geom id="0x80be700">
+ <class ref="0x80724a0"/>
<name>da1c</name>
<rank>3</rank>
- <consumer id="0x80b9380">
- <geom ref="0x80c0580"/>
- <provider ref="0x80bba00"/>
+ <consumer id="0x80b8380">
+ <geom ref="0x80be700"/>
+ <provider ref="0x80b9b00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0400">
- <class ref="0x8073600"/>
+ <geom id="0x80be580">
+ <class ref="0x80724a0"/>
<name>da1b</name>
<rank>3</rank>
- <consumer id="0x80b9340">
- <geom ref="0x80c0400"/>
- <provider ref="0x80bb980"/>
+ <consumer id="0x80b8340">
+ <geom ref="0x80be580"/>
+ <provider ref="0x80b9a80"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0280">
- <class ref="0x8073600"/>
+ <geom id="0x80be400">
+ <class ref="0x80724a0"/>
<name>da1a</name>
<rank>3</rank>
- <consumer id="0x80b9300">
- <geom ref="0x80c0280"/>
- <provider ref="0x80bb900"/>
+ <consumer id="0x80b8300">
+ <geom ref="0x80be400"/>
+ <provider ref="0x80b9a00"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80c0100">
- <class ref="0x8073600"/>
+ <geom id="0x80be280">
+ <class ref="0x80724a0"/>
<name>da0c</name>
<rank>3</rank>
- <consumer id="0x80b92c0">
- <geom ref="0x80c0100"/>
- <provider ref="0x80bb680"/>
+ <consumer id="0x80b82c0">
+ <geom ref="0x80be280"/>
+ <provider ref="0x80b9700"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbf80">
- <class ref="0x8073600"/>
+ <geom id="0x80be100">
+ <class ref="0x80724a0"/>
<name>da0b</name>
<rank>3</rank>
- <consumer id="0x80b9280">
- <geom ref="0x80bbf80"/>
- <provider ref="0x80bb600"/>
+ <consumer id="0x80b8280">
+ <geom ref="0x80be100"/>
+ <provider ref="0x80b9680"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbf00">
- <class ref="0x8073600"/>
+ <geom id="0x80be080">
+ <class ref="0x80724a0"/>
<name>da0a</name>
<rank>3</rank>
- <consumer id="0x80b9240">
- <geom ref="0x80bbf00"/>
- <provider ref="0x80bb580"/>
+ <consumer id="0x80b8240">
+ <geom ref="0x80be080"/>
+ <provider ref="0x80b9600"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bbb80">
- <class ref="0x8073600"/>
+ <geom id="0x80b9c80">
+ <class ref="0x80724a0"/>
<name>da2</name>
<rank>2</rank>
- <consumer id="0x80b91c0">
- <geom ref="0x80bbb80"/>
- <provider ref="0x80bb280"/>
+ <consumer id="0x80b81c0">
+ <geom ref="0x80b9c80"/>
+ <provider ref="0x80b9280"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb700">
- <class ref="0x8073600"/>
+ <geom id="0x80b9780">
+ <class ref="0x80724a0"/>
<name>da1</name>
<rank>2</rank>
- <consumer id="0x80b9140">
- <geom ref="0x80bb700"/>
- <provider ref="0x80bb180"/>
+ <consumer id="0x80b8140">
+ <geom ref="0x80b9780"/>
+ <provider ref="0x80b9180"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bb300">
- <class ref="0x8073600"/>
+ <geom id="0x80b9300">
+ <class ref="0x80724a0"/>
<name>da0</name>
<rank>2</rank>
- <consumer id="0x80b90c0">
- <geom ref="0x80bb300"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b80c0">
+ <geom ref="0x80b9300"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x80735e0">
- <name>MBREXT-class</name>
+ <class id="0x8072480">
+ <name>MBREXT</name>
</class>
- <class id="0x80735c0">
- <name>MBR-class</name>
+ <class id="0x8072460">
+ <name>MBR</name>
</class>
- <class id="0x8073620">
- <name>BSD-class</name>
- <geom id="0x80bbc00">
- <class ref="0x8073620"/>
+ <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="0x80b9200">
- <geom ref="0x80bbc00"/>
- <provider ref="0x80bb280"/>
+ <consumer id="0x80b8200">
+ <geom ref="0x80b9d00"/>
+ <provider ref="0x80b9280"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bbe80">
- <geom ref="0x80bbc00"/>
+ <provider id="0x80be000">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>da2c</name>
<config>
@@ -178,8 +196,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bbe00">
- <geom ref="0x80bbc00"/>
+ <provider id="0x80b9f80">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>da2b</name>
<config>
@@ -190,8 +208,8 @@
<secoffset>4286806276</secoffset>
</config>
</provider>
- <provider id="0x80bbd80">
- <geom ref="0x80bbc00"/>
+ <provider id="0x80b9f00">
+ <geom ref="0x80b9d00"/>
<mode>r0w0e0</mode>
<name>da2a</name>
<config>
@@ -203,23 +221,41 @@
</config>
</provider>
</geom>
- <geom id="0x80bb780">
- <class ref="0x8073620"/>
+ <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="0x80b9180">
- <geom ref="0x80bb780"/>
- <provider ref="0x80bb180"/>
+ <consumer id="0x80b8180">
+ <geom ref="0x80b9800"/>
+ <provider ref="0x80b9180"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bbb00">
- <geom ref="0x80bb780"/>
+ <provider id="0x80b9c00">
+ <geom ref="0x80b9800"/>
<mode>r0w0e0</mode>
<name>da1f</name>
<config>
@@ -230,8 +266,8 @@
<secoffset>2654144</secoffset>
</config>
</provider>
- <provider id="0x80bba80">
- <geom ref="0x80bb780"/>
+ <provider id="0x80b9b80">
+ <geom ref="0x80b9800"/>
<mode>r0w0e0</mode>
<name>da1e</name>
<config>
@@ -242,8 +278,8 @@
<secoffset>2613184</secoffset>
</config>
</provider>
- <provider id="0x80bba00">
- <geom ref="0x80bb780"/>
+ <provider id="0x80b9b00">
+ <geom ref="0x80b9800"/>
<mode>r0w0e0</mode>
<name>da1c</name>
<config>
@@ -254,8 +290,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb980">
- <geom ref="0x80bb780"/>
+ <provider id="0x80b9a80">
+ <geom ref="0x80b9800"/>
<mode>r0w0e0</mode>
<name>da1b</name>
<config>
@@ -266,8 +302,8 @@
<secoffset>491520</secoffset>
</config>
</provider>
- <provider id="0x80bb900">
- <geom ref="0x80bb780"/>
+ <provider id="0x80b9a00">
+ <geom ref="0x80b9800"/>
<mode>r0w0e0</mode>
<name>da1a</name>
<config>
@@ -279,23 +315,41 @@
</config>
</provider>
</geom>
- <geom id="0x80bb380">
- <class ref="0x8073620"/>
+ <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="0x80b9100">
- <geom ref="0x80bb380"/>
- <provider ref="0x80bb080"/>
+ <consumer id="0x80b8100">
+ <geom ref="0x80b9380"/>
+ <provider ref="0x80b9080"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bb680">
- <geom ref="0x80bb380"/>
+ <provider id="0x80b9700">
+ <geom ref="0x80b9380"/>
<mode>r0w0e0</mode>
<name>da0c</name>
<config>
@@ -306,8 +360,8 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bb600">
- <geom ref="0x80bb380"/>
+ <provider id="0x80b9680">
+ <geom ref="0x80b9380"/>
<mode>r0w0e0</mode>
<name>da0b</name>
<config>
@@ -318,8 +372,8 @@
<secoffset>7938048</secoffset>
</config>
</provider>
- <provider id="0x80bb580">
- <geom ref="0x80bb380"/>
+ <provider id="0x80b9600">
+ <geom ref="0x80b9380"/>
<mode>r0w0e0</mode>
<name>da0a</name>
<config>
@@ -332,34 +386,34 @@
</provider>
</geom>
</class>
- <class id="0x8073520">
+ <class id="0x80723c0">
<name>SIMDISK-class</name>
- <geom id="0x80bb200">
- <class ref="0x8073520"/>
+ <geom id="0x80b9200">
+ <class ref="0x80723c0"/>
<name>da2</name>
<rank>1</rank>
- <provider id="0x80bb280">
- <geom ref="0x80bb200"/>
+ <provider id="0x80b9280">
+ <geom ref="0x80b9200"/>
<mode>r0w0e0</mode>
<name>da2</name>
</provider>
</geom>
- <geom id="0x80bb100">
- <class ref="0x8073520"/>
+ <geom id="0x80b9100">
+ <class ref="0x80723c0"/>
<name>da1</name>
<rank>1</rank>
- <provider id="0x80bb180">
- <geom ref="0x80bb100"/>
+ <provider id="0x80b9180">
+ <geom ref="0x80b9100"/>
<mode>r0w0e0</mode>
<name>da1</name>
</provider>
</geom>
- <geom id="0x80bb000">
- <class ref="0x8073520"/>
+ <geom id="0x80b9000">
+ <class ref="0x80723c0"/>
<name>da0</name>
<rank>1</rank>
- <provider id="0x80bb080">
- <geom ref="0x80bb000"/>
+ <provider id="0x80b9080">
+ <geom ref="0x80b9000"/>
<mode>r0w0e0</mode>
<name>da0</name>
</provider>
diff --git a/tools/regression/geom/Test/T014/ref.conf b/tools/regression/geom/Test/T014/ref.conf
index 6688fd1..a2a20c0 100644
--- a/tools/regression/geom/Test/T014/ref.conf
+++ b/tools/regression/geom/Test/T014/ref.conf
@@ -1,88 +1,88 @@
<mesh>
<FreeBSD>$FreeBSD$</FreeBSD>
- <class id="0x80740e0">
+ <class id="0x8072fa0">
<name>DEV-class</name>
- <geom id="0x80bce00">
- <class ref="0x80740e0"/>
+ <geom id="0x80bce80">
+ <class ref="0x8072fa0"/>
<name>wd0s1f</name>
<rank>4</rank>
- <consumer id="0x80ba240">
- <geom ref="0x80bce00"/>
- <provider ref="0x80bc880"/>
+ <consumer id="0x80b9240">
+ <geom ref="0x80bce80"/>
+ <provider ref="0x80bc900"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bcc80">
- <class ref="0x80740e0"/>
+ <geom id="0x80bcd00">
+ <class ref="0x8072fa0"/>
<name>wd0s1e</name>
<rank>4</rank>
- <consumer id="0x80ba200">
- <geom ref="0x80bcc80"/>
- <provider ref="0x80bc800"/>
+ <consumer id="0x80b9200">
+ <geom ref="0x80bcd00"/>
+ <provider ref="0x80bc880"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bcb00">
- <class ref="0x80740e0"/>
+ <geom id="0x80bcb80">
+ <class ref="0x8072fa0"/>
<name>wd0s1c</name>
<rank>4</rank>
- <consumer id="0x80ba1c0">
- <geom ref="0x80bcb00"/>
- <provider ref="0x80bc780"/>
+ <consumer id="0x80b91c0">
+ <geom ref="0x80bcb80"/>
+ <provider ref="0x80bc800"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bc980">
- <class ref="0x80740e0"/>
+ <geom id="0x80bca00">
+ <class ref="0x8072fa0"/>
<name>wd0s1b</name>
<rank>4</rank>
- <consumer id="0x80ba180">
- <geom ref="0x80bc980"/>
- <provider ref="0x80bc700"/>
+ <consumer id="0x80b9180">
+ <geom ref="0x80bca00"/>
+ <provider ref="0x80bc780"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
- <geom id="0x80bc900">
- <class ref="0x80740e0"/>
+ <geom id="0x80bc980">
+ <class ref="0x8072fa0"/>
<name>wd0s1a</name>
<rank>4</rank>
- <consumer id="0x80ba140">
- <geom ref="0x80bc900"/>
- <provider ref="0x80bc680"/>
+ <consumer id="0x80b9140">
+ <geom ref="0x80bc980"/>
+ <provider ref="0x80bc700"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
<geom id="0x80bc300">
- <class ref="0x80740e0"/>
+ <class ref="0x8072fa0"/>
<name>wd0s1</name>
<rank>3</rank>
- <consumer id="0x80ba0c0">
+ <consumer id="0x80b90c0">
<geom ref="0x80bc300"/>
<provider ref="0x80bc280"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
<geom id="0x80bc100">
- <class ref="0x80740e0"/>
+ <class ref="0x8072fa0"/>
<name>wd0</name>
<rank>2</rank>
- <consumer id="0x80ba040">
+ <consumer id="0x80b9040">
<geom ref="0x80bc100"/>
<provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
</consumer>
</geom>
</class>
- <class id="0x8073fc0">
- <name>PC98-class</name>
+ <class id="0x8072e80">
+ <name>PC98</name>
<geom id="0x80bc180">
- <class ref="0x8073fc0"/>
+ <class ref="0x8072e80"/>
<name>wd0</name>
<rank>2</rank>
<config>
<frontstuff>8704</frontstuff>
</config>
- <consumer id="0x80ba080">
+ <consumer id="0x80b9080">
<geom ref="0x80bc180"/>
<provider ref="0x80bc080"/>
<mode>r0w0e0</mode>
@@ -103,33 +103,57 @@
</provider>
</geom>
</class>
- <class id="0x8073fe0">
- <name>SUNLABEL-class</name>
+ <class id="0x8072ea0">
+ <name>SUN</name>
</class>
- <class id="0x80740c0">
- <name>MBREXT-class</name>
+ <class id="0x8072f80">
+ <name>MBREXT</name>
</class>
- <class id="0x80740a0">
- <name>MBR-class</name>
+ <class id="0x8072f60">
+ <name>MBR</name>
</class>
- <class id="0x8074100">
- <name>BSD-class</name>
+ <class id="0x8072fc0">
+ <name>BSD</name>
<geom id="0x80bc480">
- <class ref="0x8074100"/>
+ <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="0x80ba100">
+ <consumer id="0x80b9100">
<geom ref="0x80bc480"/>
<provider ref="0x80bc280"/>
<mode>r0w0e0</mode>
<config>
</config>
</consumer>
- <provider id="0x80bc880">
+ <provider id="0x80bc900">
<geom ref="0x80bc480"/>
<mode>r0w0e0</mode>
<name>wd0s1f</name>
@@ -141,7 +165,7 @@
<secoffset>460800</secoffset>
</config>
</provider>
- <provider id="0x80bc800">
+ <provider id="0x80bc880">
<geom ref="0x80bc480"/>
<mode>r0w0e0</mode>
<name>wd0s1e</name>
@@ -153,7 +177,7 @@
<secoffset>358400</secoffset>
</config>
</provider>
- <provider id="0x80bc780">
+ <provider id="0x80bc800">
<geom ref="0x80bc480"/>
<mode>r0w0e0</mode>
<name>wd0s1c</name>
@@ -165,7 +189,7 @@
<secoffset>0</secoffset>
</config>
</provider>
- <provider id="0x80bc700">
+ <provider id="0x80bc780">
<geom ref="0x80bc480"/>
<mode>r0w0e0</mode>
<name>wd0s1b</name>
@@ -177,7 +201,7 @@
<secoffset>153600</secoffset>
</config>
</provider>
- <provider id="0x80bc680">
+ <provider id="0x80bc700">
<geom ref="0x80bc480"/>
<mode>r0w0e0</mode>
<name>wd0s1a</name>
@@ -191,10 +215,10 @@
</provider>
</geom>
</class>
- <class id="0x8074000">
+ <class id="0x8072ec0">
<name>SIMDISK-class</name>
<geom id="0x80bc000">
- <class ref="0x8074000"/>
+ <class ref="0x8072ec0"/>
<name>wd0</name>
<rank>1</rank>
<provider id="0x80bc080">
OpenPOWER on IntegriCloud