diff options
author | phk <phk@FreeBSD.org> | 2002-04-16 11:42:13 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-04-16 11:42:13 +0000 |
commit | d9b060bed348d8dcfc6d151462f56bd5cdb9de1e (patch) | |
tree | c05ea6e18bb7021635382ed2389e0093888ad030 /tools | |
parent | b9814500193331e3b93b279ab5224b997694ddfe (diff) | |
download | FreeBSD-src-d9b060bed348d8dcfc6d151462f56bd5cdb9de1e.zip FreeBSD-src-d9b060bed348d8dcfc6d151462f56bd5cdb9de1e.tar.gz |
Forgot to commit the updates to the regression test suite.
Sponsored by: DARPA & NAI labs.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/regression/geom/Test/T001/ref.conf | 256 | ||||
-rw-r--r-- | tools/regression/geom/Test/T002/ref.conf | 70 | ||||
-rw-r--r-- | tools/regression/geom/Test/T003/ref.conf | 427 | ||||
-rw-r--r-- | tools/regression/geom/Test/T004/ref.conf | 187 | ||||
-rw-r--r-- | tools/regression/geom/Test/T005/ref.conf | 85 | ||||
-rw-r--r-- | tools/regression/geom/Test/T010/ref.conf | 55 | ||||
-rw-r--r-- | tools/regression/geom/Test/T012/ref.conf | 237 | ||||
-rw-r--r-- | tools/regression/geom/Test/T013/ref.conf | 265 | ||||
-rw-r--r-- | tools/regression/geom/geom_kernsim.c | 17 | ||||
-rw-r--r-- | tools/regression/geom/geom_sim.h | 4 |
10 files changed, 854 insertions, 749 deletions
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf index a0f4450..8760176 100644 --- a/tools/regression/geom/Test/T001/ref.conf +++ b/tools/regression/geom/Test/T001/ref.conf @@ -1,193 +1,196 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8071cc0</ref> + <ref>0x8072460</ref> <name>DEV-class</name> <geom> - <ref>0x80c1580</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0c00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s3d</name> <rank>4</rank> <consumer> - <ref>0x80c1600</ref> - <geom><ref>0x80c1580</ref></geom> - <provider><ref>0x80bed00</ref></provider> + <ref>0x80b8480</ref> + <geom><ref>0x80c0c00</ref></geom> + <provider><ref>0x80c0080</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80c1480</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0a80</ref> + <class><ref>0x8072460</ref></class> <name>ad0s3c</name> <rank>4</rank> <consumer> - <ref>0x80c1500</ref> - <geom><ref>0x80c1480</ref></geom> - <provider><ref>0x80bec80</ref></provider> + <ref>0x80b8440</ref> + <geom><ref>0x80c0a80</ref></geom> + <provider><ref>0x80c0000</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80c1380</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0900</ref> + <class><ref>0x8072460</ref></class> <name>ad0s3a</name> <rank>4</rank> <consumer> - <ref>0x80c1400</ref> - <geom><ref>0x80c1380</ref></geom> - <provider><ref>0x80bec00</ref></provider> + <ref>0x80b8400</ref> + <geom><ref>0x80c0900</ref></geom> + <provider><ref>0x80bcf80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80c1280</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0780</ref> + <class><ref>0x8072460</ref></class> <name>ad0s2c</name> <rank>4</rank> <consumer> - <ref>0x80c1300</ref> - <geom><ref>0x80c1280</ref></geom> - <provider><ref>0x80be980</ref></provider> + <ref>0x80b83c0</ref> + <geom><ref>0x80c0780</ref></geom> + <provider><ref>0x80bcc80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80c1180</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0600</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1f</name> <rank>4</rank> <consumer> - <ref>0x80c1200</ref> - <geom><ref>0x80c1180</ref></geom> - <provider><ref>0x80be700</ref></provider> + <ref>0x80b8380</ref> + <geom><ref>0x80c0600</ref></geom> + <provider><ref>0x80bc980</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80c1080</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0480</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1e</name> <rank>4</rank> <consumer> - <ref>0x80c1100</ref> - <geom><ref>0x80c1080</ref></geom> - <provider><ref>0x80be680</ref></provider> + <ref>0x80b8340</ref> + <geom><ref>0x80c0480</ref></geom> + <provider><ref>0x80bc900</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bef80</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0300</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1c</name> <rank>4</rank> <consumer> - <ref>0x80c1000</ref> - <geom><ref>0x80bef80</ref></geom> - <provider><ref>0x80be600</ref></provider> + <ref>0x80b8300</ref> + <geom><ref>0x80c0300</ref></geom> + <provider><ref>0x80bc880</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bee80</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0180</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1b</name> <rank>4</rank> <consumer> - <ref>0x80bef00</ref> - <geom><ref>0x80bee80</ref></geom> - <provider><ref>0x80be580</ref></provider> + <ref>0x80b82c0</ref> + <geom><ref>0x80c0180</ref></geom> + <provider><ref>0x80bc800</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bed80</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0100</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1a</name> <rank>4</rank> <consumer> - <ref>0x80bee00</ref> - <geom><ref>0x80bed80</ref></geom> - <provider><ref>0x80be500</ref></provider> + <ref>0x80b8280</ref> + <geom><ref>0x80c0100</ref></geom> + <provider><ref>0x80bc780</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bea00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80bcd00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s3</name> <rank>3</rank> <consumer> - <ref>0x80bea80</ref> - <geom><ref>0x80bea00</ref></geom> - <provider><ref>0x80be280</ref></provider> + <ref>0x80b8200</ref> + <geom><ref>0x80bcd00</ref></geom> + <provider><ref>0x80bc400</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be780</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80bca00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s2</name> <rank>3</rank> <consumer> - <ref>0x80be800</ref> - <geom><ref>0x80be780</ref></geom> - <provider><ref>0x80be200</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80bca00</ref></geom> + <provider><ref>0x80bc380</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be300</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80bc480</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1</name> <rank>3</rank> <consumer> - <ref>0x80be380</ref> - <geom><ref>0x80be300</ref></geom> - <provider><ref>0x80be180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80bc480</ref></geom> + <provider><ref>0x80bc300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80ba080</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80bc080</ref> + <class><ref>0x8072460</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80be080</ref> - <geom><ref>0x80ba080</ref></geom> - <provider><ref>0x80be000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80bc080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8071c00</ref> + <ref>0x807243c</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x8071ca0</ref> + <ref>0x8072420</ref> <name>MBR-class</name> <geom> - <ref>0x80ba0c0</ref> - <class><ref>0x8071ca0</ref></class> + <ref>0x80bc100</ref> + <class><ref>0x8072420</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>0</frontstuff> </config> <consumer> - <ref>0x80be100</ref> - <geom><ref>0x80ba0c0</ref></geom> - <provider><ref>0x80be000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80bc100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>0</frontstuff> </config> </consumer> <provider> - <ref>0x80be280</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80bc400</ref> + <geom><ref>0x80bc100</ref></geom> <mode>r0w0e0</mode> <name>ad0s3</name> <config> + <frontstuff>0</frontstuff> <index>2</index> <length>8585256960</length> <seclength>16768080</seclength> @@ -197,11 +200,12 @@ </config> </provider> <provider> - <ref>0x80be200</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80bc380</ref> + <geom><ref>0x80bc100</ref></geom> <mode>r0w0e0</mode> <name>ad0s2</name> <config> + <frontstuff>0</frontstuff> <index>1</index> <length>5364817920</length> <seclength>10478160</seclength> @@ -211,11 +215,12 @@ </config> </provider> <provider> - <ref>0x80be180</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80bc300</ref> + <geom><ref>0x80bc100</ref></geom> <mode>r0w0e0</mode> <name>ad0s1</name> <config> + <frontstuff>0</frontstuff> <index>0</index> <length>3220406784</length> <seclength>6289857</seclength> @@ -227,29 +232,32 @@ </geom> </class> <class> - <ref>0x8071ce0</ref> + <ref>0x807247c</ref> <name>BSD-class</name> <geom> - <ref>0x80beb00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bcd80</ref> + <class><ref>0x807247c</ref></class> <name>ad0s3</name> <rank>3</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80beb80</ref> - <geom><ref>0x80beb00</ref></geom> - <provider><ref>0x80be280</ref></provider> + <ref>0x80b8240</ref> + <geom><ref>0x80bcd80</ref></geom> + <provider><ref>0x80bc400</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80bed00</ref> - <geom><ref>0x80beb00</ref></geom> + <ref>0x80c0080</ref> + <geom><ref>0x80bcd80</ref></geom> <mode>r0w0e0</mode> <name>ad0s3d</name> <config> + <frontstuff>8192</frontstuff> <index>3</index> <length>6488104960</length> <seclength>12672080</seclength> @@ -258,11 +266,12 @@ </config> </provider> <provider> - <ref>0x80bec80</ref> - <geom><ref>0x80beb00</ref></geom> + <ref>0x80c0000</ref> + <geom><ref>0x80bcd80</ref></geom> <mode>r0w0e0</mode> <name>ad0s3c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>8585256960</length> <seclength>16768080</seclength> @@ -271,11 +280,12 @@ </config> </provider> <provider> - <ref>0x80bec00</ref> - <geom><ref>0x80beb00</ref></geom> + <ref>0x80bcf80</ref> + <geom><ref>0x80bcd80</ref></geom> <mode>r0w0e0</mode> <name>ad0s3a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>2097152000</length> <seclength>4096000</seclength> @@ -285,26 +295,29 @@ </provider> </geom> <geom> - <ref>0x80be880</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bca80</ref> + <class><ref>0x807247c</ref></class> <name>ad0s2</name> <rank>3</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80be900</ref> - <geom><ref>0x80be880</ref></geom> - <provider><ref>0x80be200</ref></provider> + <ref>0x80b81c0</ref> + <geom><ref>0x80bca80</ref></geom> + <provider><ref>0x80bc380</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80be980</ref> - <geom><ref>0x80be880</ref></geom> + <ref>0x80bcc80</ref> + <geom><ref>0x80bca80</ref></geom> <mode>r0w0e0</mode> <name>ad0s2c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>5364817920</length> <seclength>10478160</seclength> @@ -314,26 +327,29 @@ </provider> </geom> <geom> - <ref>0x80be400</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bc500</ref> + <class><ref>0x807247c</ref></class> <name>ad0s1</name> <rank>3</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80be480</ref> - <geom><ref>0x80be400</ref></geom> - <provider><ref>0x80be180</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80bc500</ref></geom> + <provider><ref>0x80bc300</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80be700</ref> - <geom><ref>0x80be400</ref></geom> + <ref>0x80bc980</ref> + <geom><ref>0x80bc500</ref></geom> <mode>r0w0e0</mode> <name>ad0s1f</name> <config> + <frontstuff>8192</frontstuff> <index>5</index> <length>2066973184</length> <seclength>4037057</seclength> @@ -342,11 +358,12 @@ </config> </provider> <provider> - <ref>0x80be680</ref> - <geom><ref>0x80be400</ref></geom> + <ref>0x80bc900</ref> + <geom><ref>0x80bc500</ref></geom> <mode>r0w0e0</mode> <name>ad0s1e</name> <config> + <frontstuff>8192</frontstuff> <index>4</index> <length>524288000</length> <seclength>1024000</seclength> @@ -355,11 +372,12 @@ </config> </provider> <provider> - <ref>0x80be600</ref> - <geom><ref>0x80be400</ref></geom> + <ref>0x80bc880</ref> + <geom><ref>0x80bc500</ref></geom> <mode>r0w0e0</mode> <name>ad0s1c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>3220406784</length> <seclength>6289857</seclength> @@ -368,11 +386,12 @@ </config> </provider> <provider> - <ref>0x80be580</ref> - <geom><ref>0x80be400</ref></geom> + <ref>0x80bc800</ref> + <geom><ref>0x80bc500</ref></geom> <mode>r0w0e0</mode> <name>ad0s1b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>524288000</length> <seclength>1024000</seclength> @@ -381,11 +400,12 @@ </config> </provider> <provider> - <ref>0x80be500</ref> - <geom><ref>0x80be400</ref></geom> + <ref>0x80bc780</ref> + <geom><ref>0x80bc500</ref></geom> <mode>r0w0e0</mode> <name>ad0s1a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>104857600</length> <seclength>204800</seclength> @@ -396,16 +416,16 @@ </geom> </class> <class> - <ref>0x8071be0</ref> + <ref>0x807236c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80ba040</ref> - <class><ref>0x8071be0</ref></class> + <ref>0x80bc000</ref> + <class><ref>0x807236c</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80be000</ref> - <geom><ref>0x80ba040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80bc000</ref></geom> <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 f9b95c6..bfecc43 100644 --- a/tools/regression/geom/Test/T002/ref.conf +++ b/tools/regression/geom/Test/T002/ref.conf @@ -1,73 +1,76 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8071cc0</ref> + <ref>0x8072460</ref> <name>DEV-class</name> <geom> - <ref>0x80bb380</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9480</ref> + <class><ref>0x8072460</ref></class> <name>ad0s2</name> <rank>3</rank> <consumer> - <ref>0x80bb400</ref> - <geom><ref>0x80bb380</ref></geom> - <provider><ref>0x80bb200</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80b9480</ref></geom> + <provider><ref>0x80b9380</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb280</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9400</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1</name> <rank>3</rank> <consumer> - <ref>0x80bb300</ref> - <geom><ref>0x80bb280</ref></geom> - <provider><ref>0x80bb180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80b9400</ref></geom> + <provider><ref>0x80b9300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80ba080</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9080</ref> + <class><ref>0x8072460</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80bb080</ref> - <geom><ref>0x80ba080</ref></geom> - <provider><ref>0x80bb000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80b9080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8071c00</ref> + <ref>0x807243c</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x8071ca0</ref> + <ref>0x8072420</ref> <name>MBR-class</name> <geom> - <ref>0x80ba0c0</ref> - <class><ref>0x8071ca0</ref></class> + <ref>0x80b9100</ref> + <class><ref>0x8072420</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>0</frontstuff> </config> <consumer> - <ref>0x80bb100</ref> - <geom><ref>0x80ba0c0</ref></geom> - <provider><ref>0x80bb000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80b9100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>0</frontstuff> </config> </consumer> <provider> - <ref>0x80bb200</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80b9380</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>ad0s2</name> <config> + <frontstuff>0</frontstuff> <index>1</index> <length>4564740096</length> <seclength>8915508</seclength> @@ -77,11 +80,12 @@ </config> </provider> <provider> - <ref>0x80bb180</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80b9300</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>ad0s1</name> <config> + <frontstuff>0</frontstuff> <index>0</index> <length>296821760</length> <seclength>579730</seclength> @@ -93,20 +97,20 @@ </geom> </class> <class> - <ref>0x8071ce0</ref> + <ref>0x807247c</ref> <name>BSD-class</name> </class> <class> - <ref>0x8071be0</ref> + <ref>0x807236c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80ba040</ref> - <class><ref>0x8071be0</ref></class> + <ref>0x80b9000</ref> + <class><ref>0x807236c</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80bb000</ref> - <geom><ref>0x80ba040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80b9000</ref></geom> <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 2fd1f58..9d7c21a 100644 --- a/tools/regression/geom/Test/T003/ref.conf +++ b/tools/regression/geom/Test/T003/ref.conf @@ -1,345 +1,348 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8071cc0</ref> + <ref>0x8072460</ref> <name>DEV-class</name> <geom> - <ref>0x8124700</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80ca480</ref> + <class><ref>0x8072460</ref></class> <name>ad0s27</name> <rank>4</rank> <consumer> - <ref>0x8124780</ref> - <geom><ref>0x8124700</ref></geom> - <provider><ref>0x8101080</ref></provider> + <ref>0x80b8740</ref> + <geom><ref>0x80ca480</ref></geom> + <provider><ref>0x80c3300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124600</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80ca300</ref> + <class><ref>0x8072460</ref></class> <name>ad0s26</name> <rank>4</rank> <consumer> - <ref>0x8124680</ref> - <geom><ref>0x8124600</ref></geom> - <provider><ref>0x8101000</ref></provider> + <ref>0x80b8700</ref> + <geom><ref>0x80ca300</ref></geom> + <provider><ref>0x80c3280</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124500</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80ca180</ref> + <class><ref>0x8072460</ref></class> <name>ad0s25</name> <rank>4</rank> <consumer> - <ref>0x8124580</ref> - <geom><ref>0x8124500</ref></geom> - <provider><ref>0x80ccf80</ref></provider> + <ref>0x80b86c0</ref> + <geom><ref>0x80ca180</ref></geom> + <provider><ref>0x80c3200</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124400</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80ca000</ref> + <class><ref>0x8072460</ref></class> <name>ad0s24</name> <rank>4</rank> <consumer> - <ref>0x8124480</ref> - <geom><ref>0x8124400</ref></geom> - <provider><ref>0x80ccf00</ref></provider> + <ref>0x80b8680</ref> + <geom><ref>0x80ca000</ref></geom> + <provider><ref>0x80c3180</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124300</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5e80</ref> + <class><ref>0x8072460</ref></class> <name>ad0s23</name> <rank>4</rank> <consumer> - <ref>0x8124380</ref> - <geom><ref>0x8124300</ref></geom> - <provider><ref>0x80cce80</ref></provider> + <ref>0x80b8640</ref> + <geom><ref>0x80c5e80</ref></geom> + <provider><ref>0x80c3100</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124200</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5d00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s22</name> <rank>4</rank> <consumer> - <ref>0x8124280</ref> - <geom><ref>0x8124200</ref></geom> - <provider><ref>0x80cce00</ref></provider> + <ref>0x80b8600</ref> + <geom><ref>0x80c5d00</ref></geom> + <provider><ref>0x80c3080</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124100</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5b80</ref> + <class><ref>0x8072460</ref></class> <name>ad0s21</name> <rank>4</rank> <consumer> - <ref>0x8124180</ref> - <geom><ref>0x8124100</ref></geom> - <provider><ref>0x80ccd80</ref></provider> + <ref>0x80b85c0</ref> + <geom><ref>0x80c5b80</ref></geom> + <provider><ref>0x80c3000</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8124000</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5a00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s20</name> <rank>4</rank> <consumer> - <ref>0x8124080</ref> - <geom><ref>0x8124000</ref></geom> - <provider><ref>0x80ccd00</ref></provider> + <ref>0x80b8580</ref> + <geom><ref>0x80c5a00</ref></geom> + <provider><ref>0x80c0f80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101f00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5880</ref> + <class><ref>0x8072460</ref></class> <name>ad0s19</name> <rank>4</rank> <consumer> - <ref>0x8101f80</ref> - <geom><ref>0x8101f00</ref></geom> - <provider><ref>0x80ccc80</ref></provider> + <ref>0x80b8540</ref> + <geom><ref>0x80c5880</ref></geom> + <provider><ref>0x80c0f00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101e00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5700</ref> + <class><ref>0x8072460</ref></class> <name>ad0s18</name> <rank>4</rank> <consumer> - <ref>0x8101e80</ref> - <geom><ref>0x8101e00</ref></geom> - <provider><ref>0x80ccc00</ref></provider> + <ref>0x80b8500</ref> + <geom><ref>0x80c5700</ref></geom> + <provider><ref>0x80c0e80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101d00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5580</ref> + <class><ref>0x8072460</ref></class> <name>ad0s17</name> <rank>4</rank> <consumer> - <ref>0x8101d80</ref> - <geom><ref>0x8101d00</ref></geom> - <provider><ref>0x80ccb80</ref></provider> + <ref>0x80b84c0</ref> + <geom><ref>0x80c5580</ref></geom> + <provider><ref>0x80c0e00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101c00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5400</ref> + <class><ref>0x8072460</ref></class> <name>ad0s16</name> <rank>4</rank> <consumer> - <ref>0x8101c80</ref> - <geom><ref>0x8101c00</ref></geom> - <provider><ref>0x80ccb00</ref></provider> + <ref>0x80b8480</ref> + <geom><ref>0x80c5400</ref></geom> + <provider><ref>0x80c0d80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101b00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5280</ref> + <class><ref>0x8072460</ref></class> <name>ad0s15</name> <rank>4</rank> <consumer> - <ref>0x8101b80</ref> - <geom><ref>0x8101b00</ref></geom> - <provider><ref>0x80cca80</ref></provider> + <ref>0x80b8440</ref> + <geom><ref>0x80c5280</ref></geom> + <provider><ref>0x80c0d00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101a00</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c5100</ref> + <class><ref>0x8072460</ref></class> <name>ad0s14</name> <rank>4</rank> <consumer> - <ref>0x8101a80</ref> - <geom><ref>0x8101a00</ref></geom> - <provider><ref>0x80cca00</ref></provider> + <ref>0x80b8400</ref> + <geom><ref>0x80c5100</ref></geom> + <provider><ref>0x80c0c80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101900</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3f80</ref> + <class><ref>0x8072460</ref></class> <name>ad0s13</name> <rank>4</rank> <consumer> - <ref>0x8101980</ref> - <geom><ref>0x8101900</ref></geom> - <provider><ref>0x80cc980</ref></provider> + <ref>0x80b83c0</ref> + <geom><ref>0x80c3f80</ref></geom> + <provider><ref>0x80c0c00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101800</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3e00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s12</name> <rank>4</rank> <consumer> - <ref>0x8101880</ref> - <geom><ref>0x8101800</ref></geom> - <provider><ref>0x80cc900</ref></provider> + <ref>0x80b8380</ref> + <geom><ref>0x80c3e00</ref></geom> + <provider><ref>0x80c0b80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101700</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3c80</ref> + <class><ref>0x8072460</ref></class> <name>ad0s11</name> <rank>4</rank> <consumer> - <ref>0x8101780</ref> - <geom><ref>0x8101700</ref></geom> - <provider><ref>0x80cc880</ref></provider> + <ref>0x80b8340</ref> + <geom><ref>0x80c3c80</ref></geom> + <provider><ref>0x80c0b00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101600</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3b00</ref> + <class><ref>0x8072460</ref></class> <name>ad0s10</name> <rank>4</rank> <consumer> - <ref>0x8101680</ref> - <geom><ref>0x8101600</ref></geom> - <provider><ref>0x80cc800</ref></provider> + <ref>0x80b8300</ref> + <geom><ref>0x80c3b00</ref></geom> + <provider><ref>0x80c0a80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101500</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3980</ref> + <class><ref>0x8072460</ref></class> <name>ad0s9</name> <rank>4</rank> <consumer> - <ref>0x8101580</ref> - <geom><ref>0x8101500</ref></geom> - <provider><ref>0x80cc780</ref></provider> + <ref>0x80b82c0</ref> + <geom><ref>0x80c3980</ref></geom> + <provider><ref>0x80c0a00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101400</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3800</ref> + <class><ref>0x8072460</ref></class> <name>ad0s8</name> <rank>4</rank> <consumer> - <ref>0x8101480</ref> - <geom><ref>0x8101400</ref></geom> - <provider><ref>0x80cc700</ref></provider> + <ref>0x80b8280</ref> + <geom><ref>0x80c3800</ref></geom> + <provider><ref>0x80c0980</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101300</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3680</ref> + <class><ref>0x8072460</ref></class> <name>ad0s7</name> <rank>4</rank> <consumer> - <ref>0x8101380</ref> - <geom><ref>0x8101300</ref></geom> - <provider><ref>0x80cc680</ref></provider> + <ref>0x80b8240</ref> + <geom><ref>0x80c3680</ref></geom> + <provider><ref>0x80c0900</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101200</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3500</ref> + <class><ref>0x8072460</ref></class> <name>ad0s6</name> <rank>4</rank> <consumer> - <ref>0x8101280</ref> - <geom><ref>0x8101200</ref></geom> - <provider><ref>0x80cc600</ref></provider> + <ref>0x80b8200</ref> + <geom><ref>0x80c3500</ref></geom> + <provider><ref>0x80c0880</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x8101100</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c3380</ref> + <class><ref>0x8072460</ref></class> <name>ad0s5</name> <rank>4</rank> <consumer> - <ref>0x8101180</ref> - <geom><ref>0x8101100</ref></geom> - <provider><ref>0x80cc580</ref></provider> + <ref>0x80b81c0</ref> + <geom><ref>0x80c3380</ref></geom> + <provider><ref>0x80c0800</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80cc380</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0480</ref> + <class><ref>0x8072460</ref></class> <name>ad0s2</name> <rank>3</rank> <consumer> - <ref>0x80cc400</ref> - <geom><ref>0x80cc380</ref></geom> - <provider><ref>0x80cc200</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80c0480</ref></geom> + <provider><ref>0x80c0380</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80cc280</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0400</ref> + <class><ref>0x8072460</ref></class> <name>ad0s1</name> <rank>3</rank> <consumer> - <ref>0x80cc300</ref> - <geom><ref>0x80cc280</ref></geom> - <provider><ref>0x80cc180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80c0400</ref></geom> + <provider><ref>0x80c0300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80ba080</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80c0080</ref> + <class><ref>0x8072460</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80cc080</ref> - <geom><ref>0x80ba080</ref></geom> - <provider><ref>0x80cc000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80c0080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8071c00</ref> + <ref>0x807243c</ref> <name>MBREXT-class</name> <geom> - <ref>0x80cc480</ref> - <class><ref>0x8071c00</ref></class> + <ref>0x80c0680</ref> + <class><ref>0x807243c</ref></class> <name>ad0s2</name> <rank>3</rank> <config> + <frontstuff>0</frontstuff> </config> <consumer> - <ref>0x80cc500</ref> - <geom><ref>0x80cc480</ref></geom> - <provider><ref>0x80cc200</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80c0680</ref></geom> + <provider><ref>0x80c0380</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>0</frontstuff> </config> </consumer> <provider> - <ref>0x8101080</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3300</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s27</name> <config> + <frontstuff>0</frontstuff> <index>22</index> <length>8193024</length> <seclength>16002</seclength> @@ -349,11 +352,12 @@ </config> </provider> <provider> - <ref>0x8101000</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3280</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s26</name> <config> + <frontstuff>0</frontstuff> <index>21</index> <length>8193024</length> <seclength>16002</seclength> @@ -363,11 +367,12 @@ </config> </provider> <provider> - <ref>0x80ccf80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3200</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s25</name> <config> + <frontstuff>0</frontstuff> <index>20</index> <length>8193024</length> <seclength>16002</seclength> @@ -377,11 +382,12 @@ </config> </provider> <provider> - <ref>0x80ccf00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3180</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s24</name> <config> + <frontstuff>0</frontstuff> <index>19</index> <length>8193024</length> <seclength>16002</seclength> @@ -391,11 +397,12 @@ </config> </provider> <provider> - <ref>0x80cce80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3100</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s23</name> <config> + <frontstuff>0</frontstuff> <index>18</index> <length>8193024</length> <seclength>16002</seclength> @@ -405,11 +412,12 @@ </config> </provider> <provider> - <ref>0x80cce00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3080</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s22</name> <config> + <frontstuff>0</frontstuff> <index>17</index> <length>8193024</length> <seclength>16002</seclength> @@ -419,11 +427,12 @@ </config> </provider> <provider> - <ref>0x80ccd80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c3000</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s21</name> <config> + <frontstuff>0</frontstuff> <index>16</index> <length>8193024</length> <seclength>16002</seclength> @@ -433,11 +442,12 @@ </config> </provider> <provider> - <ref>0x80ccd00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0f80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s20</name> <config> + <frontstuff>0</frontstuff> <index>15</index> <length>8193024</length> <seclength>16002</seclength> @@ -447,11 +457,12 @@ </config> </provider> <provider> - <ref>0x80ccc80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0f00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s19</name> <config> + <frontstuff>0</frontstuff> <index>14</index> <length>8193024</length> <seclength>16002</seclength> @@ -461,11 +472,12 @@ </config> </provider> <provider> - <ref>0x80ccc00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0e80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s18</name> <config> + <frontstuff>0</frontstuff> <index>13</index> <length>8193024</length> <seclength>16002</seclength> @@ -475,11 +487,12 @@ </config> </provider> <provider> - <ref>0x80ccb80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0e00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s17</name> <config> + <frontstuff>0</frontstuff> <index>12</index> <length>8193024</length> <seclength>16002</seclength> @@ -489,11 +502,12 @@ </config> </provider> <provider> - <ref>0x80ccb00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0d80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s16</name> <config> + <frontstuff>0</frontstuff> <index>11</index> <length>8193024</length> <seclength>16002</seclength> @@ -503,11 +517,12 @@ </config> </provider> <provider> - <ref>0x80cca80</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0d00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s15</name> <config> + <frontstuff>0</frontstuff> <index>10</index> <length>8193024</length> <seclength>16002</seclength> @@ -517,11 +532,12 @@ </config> </provider> <provider> - <ref>0x80cca00</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0c80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s14</name> <config> + <frontstuff>0</frontstuff> <index>9</index> <length>8193024</length> <seclength>16002</seclength> @@ -531,11 +547,12 @@ </config> </provider> <provider> - <ref>0x80cc980</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0c00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s13</name> <config> + <frontstuff>0</frontstuff> <index>8</index> <length>8193024</length> <seclength>16002</seclength> @@ -545,11 +562,12 @@ </config> </provider> <provider> - <ref>0x80cc900</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0b80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s12</name> <config> + <frontstuff>0</frontstuff> <index>7</index> <length>8193024</length> <seclength>16002</seclength> @@ -559,11 +577,12 @@ </config> </provider> <provider> - <ref>0x80cc880</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0b00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s11</name> <config> + <frontstuff>0</frontstuff> <index>6</index> <length>8193024</length> <seclength>16002</seclength> @@ -573,11 +592,12 @@ </config> </provider> <provider> - <ref>0x80cc800</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0a80</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s10</name> <config> + <frontstuff>0</frontstuff> <index>5</index> <length>8193024</length> <seclength>16002</seclength> @@ -587,11 +607,12 @@ </config> </provider> <provider> - <ref>0x80cc780</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0a00</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s9</name> <config> + <frontstuff>0</frontstuff> <index>4</index> <length>8193024</length> <seclength>16002</seclength> @@ -601,11 +622,12 @@ </config> </provider> <provider> - <ref>0x80cc700</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0980</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s8</name> <config> + <frontstuff>0</frontstuff> <index>3</index> <length>8193024</length> <seclength>16002</seclength> @@ -615,11 +637,12 @@ </config> </provider> <provider> - <ref>0x80cc680</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0900</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s7</name> <config> + <frontstuff>0</frontstuff> <index>2</index> <length>8193024</length> <seclength>16002</seclength> @@ -629,11 +652,12 @@ </config> </provider> <provider> - <ref>0x80cc600</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0880</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s6</name> <config> + <frontstuff>0</frontstuff> <index>1</index> <length>8193024</length> <seclength>16002</seclength> @@ -643,11 +667,12 @@ </config> </provider> <provider> - <ref>0x80cc580</ref> - <geom><ref>0x80cc480</ref></geom> + <ref>0x80c0800</ref> + <geom><ref>0x80c0680</ref></geom> <mode>r0w0e0</mode> <name>ad0s5</name> <config> + <frontstuff>0</frontstuff> <index>0</index> <length>8193024</length> <seclength>16002</seclength> @@ -659,29 +684,32 @@ </geom> </class> <class> - <ref>0x8071ca0</ref> + <ref>0x8072420</ref> <name>MBR-class</name> <geom> - <ref>0x80ba0c0</ref> - <class><ref>0x8071ca0</ref></class> + <ref>0x80c0100</ref> + <class><ref>0x8072420</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>0</frontstuff> </config> <consumer> - <ref>0x80cc100</ref> - <geom><ref>0x80ba0c0</ref></geom> - <provider><ref>0x80cc000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80c0100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>0</frontstuff> </config> </consumer> <provider> - <ref>0x80cc200</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80c0380</ref> + <geom><ref>0x80c0100</ref></geom> <mode>r0w0e0</mode> <name>ad0s2</name> <config> + <frontstuff>0</frontstuff> <index>1</index> <length>427714560</length> <seclength>835380</seclength> @@ -691,11 +719,12 @@ </config> </provider> <provider> - <ref>0x80cc180</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80c0300</ref> + <geom><ref>0x80c0100</ref></geom> <mode>r0w0e0</mode> <name>ad0s1</name> <config> + <frontstuff>0</frontstuff> <index>0</index> <length>2146765824</length> <seclength>4192902</seclength> @@ -707,20 +736,20 @@ </geom> </class> <class> - <ref>0x8071ce0</ref> + <ref>0x807247c</ref> <name>BSD-class</name> </class> <class> - <ref>0x8071be0</ref> + <ref>0x807236c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80ba040</ref> - <class><ref>0x8071be0</ref></class> + <ref>0x80c0000</ref> + <class><ref>0x807236c</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80cc000</ref> - <geom><ref>0x80ba040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80c0000</ref></geom> <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 20b111a..c482baa 100644 --- a/tools/regression/geom/Test/T004/ref.conf +++ b/tools/regression/geom/Test/T004/ref.conf @@ -1,157 +1,160 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8071ce0</ref> + <ref>0x8072480</ref> <name>DEV-class</name> <geom> - <ref>0x80bef00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bd400</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1h</name> <rank>4</rank> <consumer> - <ref>0x80bef80</ref> - <geom><ref>0x80bef00</ref></geom> - <provider><ref>0x80be780</ref></provider> + <ref>0x80b8340</ref> + <geom><ref>0x80bd400</ref></geom> + <provider><ref>0x80bca00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bee00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bd280</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1g</name> <rank>4</rank> <consumer> - <ref>0x80bee80</ref> - <geom><ref>0x80bee00</ref></geom> - <provider><ref>0x80be700</ref></provider> + <ref>0x80b8300</ref> + <geom><ref>0x80bd280</ref></geom> + <provider><ref>0x80bc980</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bed00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bd100</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1f</name> <rank>4</rank> <consumer> - <ref>0x80bed80</ref> - <geom><ref>0x80bed00</ref></geom> - <provider><ref>0x80be680</ref></provider> + <ref>0x80b82c0</ref> + <geom><ref>0x80bd100</ref></geom> + <provider><ref>0x80bc900</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bec00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bcf80</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1e</name> <rank>4</rank> <consumer> - <ref>0x80bec80</ref> - <geom><ref>0x80bec00</ref></geom> - <provider><ref>0x80be600</ref></provider> + <ref>0x80b8280</ref> + <geom><ref>0x80bcf80</ref></geom> + <provider><ref>0x80bc880</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80beb00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bce00</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1d</name> <rank>4</rank> <consumer> - <ref>0x80beb80</ref> - <geom><ref>0x80beb00</ref></geom> - <provider><ref>0x80be580</ref></provider> + <ref>0x80b8240</ref> + <geom><ref>0x80bce00</ref></geom> + <provider><ref>0x80bc800</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bea00</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bcc80</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1c</name> <rank>4</rank> <consumer> - <ref>0x80bea80</ref> - <geom><ref>0x80bea00</ref></geom> - <provider><ref>0x80be500</ref></provider> + <ref>0x80b8200</ref> + <geom><ref>0x80bcc80</ref></geom> + <provider><ref>0x80bc780</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be900</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bcb00</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1b</name> <rank>4</rank> <consumer> - <ref>0x80be980</ref> - <geom><ref>0x80be900</ref></geom> - <provider><ref>0x80be480</ref></provider> + <ref>0x80b81c0</ref> + <geom><ref>0x80bcb00</ref></geom> + <provider><ref>0x80bc700</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be800</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bca80</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1a</name> <rank>4</rank> <consumer> - <ref>0x80be880</ref> - <geom><ref>0x80be800</ref></geom> - <provider><ref>0x80be400</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80bca80</ref></geom> + <provider><ref>0x80bc680</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be200</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bc380</ref> + <class><ref>0x8072480</ref></class> <name>ad0s1</name> <rank>3</rank> <consumer> - <ref>0x80be280</ref> - <geom><ref>0x80be200</ref></geom> - <provider><ref>0x80be180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80bc380</ref></geom> + <provider><ref>0x80bc300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80ba080</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80bc080</ref> + <class><ref>0x8072480</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80be080</ref> - <geom><ref>0x80ba080</ref></geom> - <provider><ref>0x80be000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80bc080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8071c20</ref> + <ref>0x807245c</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x8071cc0</ref> + <ref>0x8072440</ref> <name>MBR-class</name> <geom> - <ref>0x80ba0c0</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80bc100</ref> + <class><ref>0x8072440</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>0</frontstuff> </config> <consumer> - <ref>0x80be100</ref> - <geom><ref>0x80ba0c0</ref></geom> - <provider><ref>0x80be000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80bc100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>0</frontstuff> </config> </consumer> <provider> - <ref>0x80be180</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80bc300</ref> + <geom><ref>0x80bc100</ref></geom> <mode>r0w0e0</mode> <name>ad0s1</name> <config> + <frontstuff>0</frontstuff> <index>0</index> <length>20003848704</length> <seclength>39070017</seclength> @@ -163,29 +166,32 @@ </geom> </class> <class> - <ref>0x8071d00</ref> + <ref>0x807249c</ref> <name>BSD-class</name> <geom> - <ref>0x80be300</ref> - <class><ref>0x8071d00</ref></class> + <ref>0x80bc400</ref> + <class><ref>0x807249c</ref></class> <name>ad0s1</name> <rank>3</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80be380</ref> - <geom><ref>0x80be300</ref></geom> - <provider><ref>0x80be180</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80bc400</ref></geom> + <provider><ref>0x80bc300</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80be780</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bca00</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1h</name> <config> + <frontstuff>8192</frontstuff> <index>7</index> <length>5368709120</length> <seclength>10485760</seclength> @@ -194,11 +200,12 @@ </config> </provider> <provider> - <ref>0x80be700</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc980</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1g</name> <config> + <frontstuff>8192</frontstuff> <index>6</index> <length>3221225472</length> <seclength>6291456</seclength> @@ -207,11 +214,12 @@ </config> </provider> <provider> - <ref>0x80be680</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc900</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1f</name> <config> + <frontstuff>8192</frontstuff> <index>5</index> <length>4294967296</length> <seclength>8388608</seclength> @@ -220,11 +228,12 @@ </config> </provider> <provider> - <ref>0x80be600</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc880</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1e</name> <config> + <frontstuff>8192</frontstuff> <index>4</index> <length>524288000</length> <seclength>1024000</seclength> @@ -233,11 +242,12 @@ </config> </provider> <provider> - <ref>0x80be580</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc800</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1d</name> <config> + <frontstuff>8192</frontstuff> <index>3</index> <length>4447175168</length> <seclength>8685889</seclength> @@ -246,11 +256,12 @@ </config> </provider> <provider> - <ref>0x80be500</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc780</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>20003848704</length> <seclength>39070017</seclength> @@ -259,11 +270,12 @@ </config> </provider> <provider> - <ref>0x80be480</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc700</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>1073741824</length> <seclength>2097152</seclength> @@ -272,11 +284,12 @@ </config> </provider> <provider> - <ref>0x80be400</ref> - <geom><ref>0x80be300</ref></geom> + <ref>0x80bc680</ref> + <geom><ref>0x80bc400</ref></geom> <mode>r0w0e0</mode> <name>ad0s1a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>1073741824</length> <seclength>2097152</seclength> @@ -287,16 +300,16 @@ </geom> </class> <class> - <ref>0x8071c00</ref> + <ref>0x807238c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80ba040</ref> - <class><ref>0x8071c00</ref></class> + <ref>0x80bc000</ref> + <class><ref>0x807238c</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80be000</ref> - <geom><ref>0x80ba040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80bc000</ref></geom> <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 aa3055c..9a8dd33 100644 --- a/tools/regression/geom/Test/T005/ref.conf +++ b/tools/regression/geom/Test/T005/ref.conf @@ -1,89 +1,92 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8071cc0</ref> + <ref>0x8072460</ref> <name>DEV-class</name> <geom> - <ref>0x80bb500</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9680</ref> + <class><ref>0x8072460</ref></class> <name>ad0c</name> <rank>3</rank> <consumer> - <ref>0x80bb580</ref> - <geom><ref>0x80bb500</ref></geom> - <provider><ref>0x80bb280</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80b9680</ref></geom> + <provider><ref>0x80b9400</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb400</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9500</ref> + <class><ref>0x8072460</ref></class> <name>ad0b</name> <rank>3</rank> <consumer> - <ref>0x80bb480</ref> - <geom><ref>0x80bb400</ref></geom> - <provider><ref>0x80bb200</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80b9500</ref></geom> + <provider><ref>0x80b9380</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb300</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9480</ref> + <class><ref>0x8072460</ref></class> <name>ad0a</name> <rank>3</rank> <consumer> - <ref>0x80bb380</ref> - <geom><ref>0x80bb300</ref></geom> - <provider><ref>0x80bb180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80b9480</ref></geom> + <provider><ref>0x80b9300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80ba080</ref> - <class><ref>0x8071cc0</ref></class> + <ref>0x80b9080</ref> + <class><ref>0x8072460</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80bb080</ref> - <geom><ref>0x80ba080</ref></geom> - <provider><ref>0x80bb000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80b9080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8071c00</ref> + <ref>0x807243c</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x8071ca0</ref> + <ref>0x8072420</ref> <name>MBR-class</name> </class> <class> - <ref>0x8071ce0</ref> + <ref>0x807247c</ref> <name>BSD-class</name> <geom> - <ref>0x80ba0c0</ref> - <class><ref>0x8071ce0</ref></class> + <ref>0x80b9100</ref> + <class><ref>0x807247c</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80bb100</ref> - <geom><ref>0x80ba0c0</ref></geom> - <provider><ref>0x80bb000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80b9100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80bb280</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80b9400</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>ad0c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>1474560</length> <seclength>2880</seclength> @@ -92,11 +95,12 @@ </config> </provider> <provider> - <ref>0x80bb200</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80b9380</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>ad0b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>1474560</length> <seclength>2880</seclength> @@ -105,11 +109,12 @@ </config> </provider> <provider> - <ref>0x80bb180</ref> - <geom><ref>0x80ba0c0</ref></geom> + <ref>0x80b9300</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>ad0a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>1474560</length> <seclength>2880</seclength> @@ -120,16 +125,16 @@ </geom> </class> <class> - <ref>0x8071be0</ref> + <ref>0x807236c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80ba040</ref> - <class><ref>0x8071be0</ref></class> + <ref>0x80b9000</ref> + <class><ref>0x807236c</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80bb000</ref> - <geom><ref>0x80ba040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80b9000</ref></geom> <mode>r0w0e0</mode> <name>ad0</name> </provider> diff --git a/tools/regression/geom/Test/T010/ref.conf b/tools/regression/geom/Test/T010/ref.conf index ab26e72..927399c 100644 --- a/tools/regression/geom/Test/T010/ref.conf +++ b/tools/regression/geom/Test/T010/ref.conf @@ -1,65 +1,68 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x80725a0</ref> + <ref>0x80724c0</ref> <name>DEV-class</name> <geom> - <ref>0x80ba200</ref> - <class><ref>0x80725a0</ref></class> + <ref>0x80bb400</ref> + <class><ref>0x80724c0</ref></class> <name>ad0c</name> <rank>3</rank> <consumer> - <ref>0x80ba280</ref> - <geom><ref>0x80ba200</ref></geom> - <provider><ref>0x80ba180</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80bb400</ref></geom> + <provider><ref>0x80bb380</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb080</ref> - <class><ref>0x80725a0</ref></class> + <ref>0x80bb100</ref> + <class><ref>0x80724c0</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80ba080</ref> - <geom><ref>0x80bb080</ref></geom> - <provider><ref>0x80ba000</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80bb100</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r1w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x80724a0</ref> + <ref>0x807249c</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x8072560</ref> + <ref>0x8072480</ref> <name>MBR-class</name> </class> <class> - <ref>0x80725e0</ref> + <ref>0x80724dc</ref> <name>BSD-class</name> <geom> - <ref>0x80bb0c0</ref> - <class><ref>0x80725e0</ref></class> + <ref>0x80bb180</ref> + <class><ref>0x80724dc</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80ba100</ref> - <geom><ref>0x80bb0c0</ref></geom> - <provider><ref>0x80ba000</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80bb180</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80ba180</ref> - <geom><ref>0x80bb0c0</ref></geom> + <ref>0x80bb380</ref> + <geom><ref>0x80bb180</ref></geom> <mode>r0w0e0</mode> <name>ad0c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>1474560</length> <seclength>2880</seclength> @@ -70,16 +73,16 @@ </geom> </class> <class> - <ref>0x8072460</ref> + <ref>0x80723cc</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80bb040</ref> - <class><ref>0x8072460</ref></class> + <ref>0x80bb080</ref> + <class><ref>0x80723cc</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80ba000</ref> - <geom><ref>0x80bb040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80bb080</ref></geom> <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 5ae3f62..e4293f2 100644 --- a/tools/regression/geom/Test/T012/ref.conf +++ b/tools/regression/geom/Test/T012/ref.conf @@ -1,29 +1,32 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8072160</ref> + <ref>0x80729cc</ref> <name>SUNLABEL-class</name> <geom> - <ref>0x80b8480</ref> - <class><ref>0x8072160</ref></class> + <ref>0x80b9c00</ref> + <class><ref>0x80729cc</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80b84c0</ref> - <geom><ref>0x80b8480</ref></geom> - <provider><ref>0x80b8440</ref></provider> + <ref>0x80b8280</ref> + <geom><ref>0x80b9c00</ref></geom> + <provider><ref>0x80b8240</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80b8680</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9f80</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0h</name> <config> + <frontstuff>8192</frontstuff> <index>7</index> <length>1343787008</length> <seclength>2624584</seclength> @@ -32,11 +35,12 @@ </config> </provider> <provider> - <ref>0x80b8640</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9f00</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0g</name> <config> + <frontstuff>8192</frontstuff> <index>6</index> <length>2149576704</length> <seclength>4198392</seclength> @@ -45,11 +49,12 @@ </config> </provider> <provider> - <ref>0x80b8600</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9e80</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0f</name> <config> + <frontstuff>8192</frontstuff> <index>5</index> <length>2149576704</length> <seclength>4198392</seclength> @@ -58,11 +63,12 @@ </config> </provider> <provider> - <ref>0x80b85c0</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9e00</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0d</name> <config> + <frontstuff>8192</frontstuff> <index>3</index> <length>11124240384</length> <seclength>21727032</seclength> @@ -71,11 +77,12 @@ </config> </provider> <provider> - <ref>0x80b8580</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9d80</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>18108555264</length> <seclength>35368272</seclength> @@ -84,11 +91,12 @@ </config> </provider> <provider> - <ref>0x80b8540</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9d00</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>1075994624</length> <seclength>2101552</seclength> @@ -97,11 +105,12 @@ </config> </provider> <provider> - <ref>0x80b8500</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9c80</ref> + <geom><ref>0x80b9c00</ref></geom> <mode>r0w0e0</mode> <name>ad0a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>262967296</length> <seclength>513608</seclength> @@ -111,26 +120,29 @@ </provider> </geom> <geom> - <ref>0x80b80c0</ref> - <class><ref>0x8072160</ref></class> + <ref>0x80b9080</ref> + <class><ref>0x80729cc</ref></class> <name>ad0</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80b8100</ref> - <geom><ref>0x80b80c0</ref></geom> - <provider><ref>0x80b8080</ref></provider> + <ref>0x80b8080</ref> + <geom><ref>0x80b9080</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80b8200</ref> - <geom><ref>0x80b80c0</ref></geom> + <ref>0x80b9300</ref> + <geom><ref>0x80b9080</ref></geom> <mode>r0w0e0</mode> <name>ad0h</name> <config> + <frontstuff>8192</frontstuff> <index>7</index> <length>34629267456</length> <seclength>67635288</seclength> @@ -139,11 +151,12 @@ </config> </provider> <provider> - <ref>0x80b81c0</ref> - <geom><ref>0x80b80c0</ref></geom> + <ref>0x80b9280</ref> + <geom><ref>0x80b9080</ref></geom> <mode>r0w0e0</mode> <name>ad0c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>36698296320</length> <seclength>71676360</seclength> @@ -152,11 +165,12 @@ </config> </provider> <provider> - <ref>0x80b8180</ref> - <geom><ref>0x80b80c0</ref></geom> + <ref>0x80b9200</ref> + <geom><ref>0x80b9080</ref></geom> <mode>r0w0e0</mode> <name>ad0b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>539320320</length> <seclength>1053360</seclength> @@ -165,11 +179,12 @@ </config> </provider> <provider> - <ref>0x80b8140</ref> - <geom><ref>0x80b80c0</ref></geom> + <ref>0x80b9180</ref> + <geom><ref>0x80b9080</ref></geom> <mode>r0w0e0</mode> <name>ad0a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>1529708544</length> <seclength>2987712</seclength> @@ -180,200 +195,200 @@ </geom> </class> <class> - <ref>0x80722e0</ref> + <ref>0x8072ae0</ref> <name>DEV-class</name> <geom> - <ref>0x80c5100</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1980</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0h</name> <rank>3</rank> <consumer> - <ref>0x80b88c0</ref> - <geom><ref>0x80c5100</ref></geom> - <provider><ref>0x80b8680</ref></provider> + <ref>0x80b8480</ref> + <geom><ref>0x80c1980</ref></geom> + <provider><ref>0x80b9f80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bbf80</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1800</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0g</name> <rank>3</rank> <consumer> - <ref>0x80b8880</ref> - <geom><ref>0x80bbf80</ref></geom> - <provider><ref>0x80b8640</ref></provider> + <ref>0x80b8440</ref> + <geom><ref>0x80c1800</ref></geom> + <provider><ref>0x80b9f00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bbe00</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1680</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0f</name> <rank>3</rank> <consumer> - <ref>0x80b8840</ref> - <geom><ref>0x80bbe00</ref></geom> - <provider><ref>0x80b8600</ref></provider> + <ref>0x80b8400</ref> + <geom><ref>0x80c1680</ref></geom> + <provider><ref>0x80b9e80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bbc80</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1500</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0d</name> <rank>3</rank> <consumer> - <ref>0x80b8800</ref> - <geom><ref>0x80bbc80</ref></geom> - <provider><ref>0x80b85c0</ref></provider> + <ref>0x80b83c0</ref> + <geom><ref>0x80c1500</ref></geom> + <provider><ref>0x80b9e00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bbb00</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1380</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0c</name> <rank>3</rank> <consumer> - <ref>0x80b87c0</ref> - <geom><ref>0x80bbb00</ref></geom> - <provider><ref>0x80b8580</ref></provider> + <ref>0x80b8380</ref> + <geom><ref>0x80c1380</ref></geom> + <provider><ref>0x80b9d80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb980</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1200</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0b</name> <rank>3</rank> <consumer> - <ref>0x80b8780</ref> - <geom><ref>0x80bb980</ref></geom> - <provider><ref>0x80b8540</ref></provider> + <ref>0x80b8340</ref> + <geom><ref>0x80c1200</ref></geom> + <provider><ref>0x80b9d00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb900</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1080</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0a</name> <rank>3</rank> <consumer> - <ref>0x80b8740</ref> - <geom><ref>0x80bb900</ref></geom> - <provider><ref>0x80b8500</ref></provider> + <ref>0x80b8300</ref> + <geom><ref>0x80c1080</ref></geom> + <provider><ref>0x80b9c80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80b86c0</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80c1000</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80b8700</ref> - <geom><ref>0x80b86c0</ref></geom> - <provider><ref>0x80b8440</ref></provider> + <ref>0x80b82c0</ref> + <geom><ref>0x80c1000</ref></geom> + <provider><ref>0x80b8240</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb580</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80b9900</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0h</name> <rank>3</rank> <consumer> - <ref>0x80b8380</ref> - <geom><ref>0x80bb580</ref></geom> - <provider><ref>0x80b8200</ref></provider> + <ref>0x80b81c0</ref> + <geom><ref>0x80b9900</ref></geom> + <provider><ref>0x80b9300</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb400</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80b9780</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0c</name> <rank>3</rank> <consumer> - <ref>0x80b8340</ref> - <geom><ref>0x80bb400</ref></geom> - <provider><ref>0x80b81c0</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80b9780</ref></geom> + <provider><ref>0x80b9280</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb200</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80b9580</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0b</name> <rank>3</rank> <consumer> - <ref>0x80b8300</ref> - <geom><ref>0x80bb200</ref></geom> - <provider><ref>0x80b8180</ref></provider> + <ref>0x80b8140</ref> + <geom><ref>0x80b9580</ref></geom> + <provider><ref>0x80b9200</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bb180</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80b9400</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0a</name> <rank>3</rank> <consumer> - <ref>0x80b82c0</ref> - <geom><ref>0x80bb180</ref></geom> - <provider><ref>0x80b8140</ref></provider> + <ref>0x80b8100</ref> + <geom><ref>0x80b9400</ref></geom> + <provider><ref>0x80b9180</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80b8240</ref> - <class><ref>0x80722e0</ref></class> + <ref>0x80b9380</ref> + <class><ref>0x8072ae0</ref></class> <name>ad0</name> <rank>2</rank> <consumer> - <ref>0x80b8280</ref> - <geom><ref>0x80b8240</ref></geom> - <provider><ref>0x80b8080</ref></provider> + <ref>0x80b80c0</ref> + <geom><ref>0x80b9380</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x80721e0</ref> + <ref>0x8072abc</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x80722a0</ref> + <ref>0x8072aa0</ref> <name>MBR-class</name> </class> <class> - <ref>0x8072320</ref> + <ref>0x8072afc</ref> <name>BSD-class</name> </class> <class> - <ref>0x80721a0</ref> + <ref>0x80729e8</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80b8400</ref> - <class><ref>0x80721a0</ref></class> + <ref>0x80b9a80</ref> + <class><ref>0x80729e8</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80b8440</ref> - <geom><ref>0x80b8400</ref></geom> + <ref>0x80b8240</ref> + <geom><ref>0x80b9a80</ref></geom> <mode>r0w0e0</mode> <name>ad0</name> </provider> </geom> <geom> - <ref>0x80b8040</ref> - <class><ref>0x80721a0</ref></class> + <ref>0x80b9000</ref> + <class><ref>0x80729e8</ref></class> <name>ad0</name> <rank>1</rank> <provider> - <ref>0x80b8080</ref> - <geom><ref>0x80b8040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80b9000</ref></geom> <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 1c47642..5629a41 100644 --- a/tools/regression/geom/Test/T013/ref.conf +++ b/tools/regression/geom/Test/T013/ref.conf @@ -1,209 +1,212 @@ <mesh> <FreeBSD>$FreeBSD$</FreeBSD> <class> - <ref>0x8072260</ref> + <ref>0x8072500</ref> <name>DEV-class</name> <geom> - <ref>0x80be180</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bdb80</ref> + <class><ref>0x8072500</ref></class> <name>da2c</name> <rank>3</rank> <consumer> - <ref>0x80b8a80</ref> - <geom><ref>0x80be180</ref></geom> - <provider><ref>0x80b87c0</ref></provider> + <ref>0x80b8580</ref> + <geom><ref>0x80bdb80</ref></geom> + <provider><ref>0x80b9d00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80be000</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bda00</ref> + <class><ref>0x8072500</ref></class> <name>da2b</name> <rank>3</rank> <consumer> - <ref>0x80b8a40</ref> - <geom><ref>0x80be000</ref></geom> - <provider><ref>0x80b8780</ref></provider> + <ref>0x80b8540</ref> + <geom><ref>0x80bda00</ref></geom> + <provider><ref>0x80b9c80</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bce80</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd880</ref> + <class><ref>0x8072500</ref></class> <name>da2a</name> <rank>3</rank> <consumer> - <ref>0x80b8a00</ref> - <geom><ref>0x80bce80</ref></geom> - <provider><ref>0x80b8740</ref></provider> + <ref>0x80b8500</ref> + <geom><ref>0x80bd880</ref></geom> + <provider><ref>0x80b9c00</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bcd00</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd700</ref> + <class><ref>0x8072500</ref></class> <name>da1f</name> <rank>3</rank> <consumer> - <ref>0x80b89c0</ref> - <geom><ref>0x80bcd00</ref></geom> - <provider><ref>0x80b8600</ref></provider> + <ref>0x80b84c0</ref> + <geom><ref>0x80bd700</ref></geom> + <provider><ref>0x80b9980</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bcb80</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd580</ref> + <class><ref>0x8072500</ref></class> <name>da1e</name> <rank>3</rank> <consumer> - <ref>0x80b8980</ref> - <geom><ref>0x80bcb80</ref></geom> - <provider><ref>0x80b85c0</ref></provider> + <ref>0x80b8480</ref> + <geom><ref>0x80bd580</ref></geom> + <provider><ref>0x80b9900</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bca00</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd400</ref> + <class><ref>0x8072500</ref></class> <name>da1c</name> <rank>3</rank> <consumer> - <ref>0x80b8940</ref> - <geom><ref>0x80bca00</ref></geom> - <provider><ref>0x80b8580</ref></provider> + <ref>0x80b8440</ref> + <geom><ref>0x80bd400</ref></geom> + <provider><ref>0x80b9880</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bc880</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd280</ref> + <class><ref>0x8072500</ref></class> <name>da1b</name> <rank>3</rank> <consumer> - <ref>0x80b8900</ref> - <geom><ref>0x80bc880</ref></geom> - <provider><ref>0x80b8540</ref></provider> + <ref>0x80b8400</ref> + <geom><ref>0x80bd280</ref></geom> + <provider><ref>0x80b9800</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bc700</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80bd100</ref> + <class><ref>0x8072500</ref></class> <name>da1a</name> <rank>3</rank> <consumer> - <ref>0x80b88c0</ref> - <geom><ref>0x80bc700</ref></geom> - <provider><ref>0x80b8500</ref></provider> + <ref>0x80b83c0</ref> + <geom><ref>0x80bd100</ref></geom> + <provider><ref>0x80b9780</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bc580</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9f80</ref> + <class><ref>0x8072500</ref></class> <name>da0c</name> <rank>3</rank> <consumer> - <ref>0x80b8880</ref> - <geom><ref>0x80bc580</ref></geom> - <provider><ref>0x80b83c0</ref></provider> + <ref>0x80b8380</ref> + <geom><ref>0x80b9f80</ref></geom> + <provider><ref>0x80b9500</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bc400</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9e00</ref> + <class><ref>0x8072500</ref></class> <name>da0b</name> <rank>3</rank> <consumer> - <ref>0x80b8840</ref> - <geom><ref>0x80bc400</ref></geom> - <provider><ref>0x80b8380</ref></provider> + <ref>0x80b8340</ref> + <geom><ref>0x80b9e00</ref></geom> + <provider><ref>0x80b9480</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80bc380</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9d80</ref> + <class><ref>0x8072500</ref></class> <name>da0a</name> <rank>3</rank> <consumer> - <ref>0x80b8800</ref> - <geom><ref>0x80bc380</ref></geom> - <provider><ref>0x80b8340</ref></provider> + <ref>0x80b8300</ref> + <geom><ref>0x80b9d80</ref></geom> + <provider><ref>0x80b9400</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80b8640</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9a00</ref> + <class><ref>0x8072500</ref></class> <name>da2</name> <rank>2</rank> <consumer> - <ref>0x80b8680</ref> - <geom><ref>0x80b8640</ref></geom> - <provider><ref>0x80b8200</ref></provider> + <ref>0x80b8280</ref> + <geom><ref>0x80b9a00</ref></geom> + <provider><ref>0x80b8140</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80b8400</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9580</ref> + <class><ref>0x8072500</ref></class> <name>da1</name> <rank>2</rank> <consumer> - <ref>0x80b8440</ref> - <geom><ref>0x80b8400</ref></geom> - <provider><ref>0x80b8140</ref></provider> + <ref>0x80b8200</ref> + <geom><ref>0x80b9580</ref></geom> + <provider><ref>0x80b80c0</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> <geom> - <ref>0x80b8240</ref> - <class><ref>0x8072260</ref></class> + <ref>0x80b9180</ref> + <class><ref>0x8072500</ref></class> <name>da0</name> <rank>2</rank> <consumer> - <ref>0x80b8280</ref> - <geom><ref>0x80b8240</ref></geom> - <provider><ref>0x80b8080</ref></provider> + <ref>0x80b8180</ref> + <geom><ref>0x80b9180</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> </consumer> </geom> </class> <class> - <ref>0x8072220</ref> + <ref>0x80724dc</ref> <name>MBREXT-class</name> </class> <class> - <ref>0x80721e0</ref> + <ref>0x80724c0</ref> <name>MBR-class</name> </class> <class> - <ref>0x80722a0</ref> + <ref>0x807251c</ref> <name>BSD-class</name> <geom> - <ref>0x80b86c0</ref> - <class><ref>0x80722a0</ref></class> + <ref>0x80b9a80</ref> + <class><ref>0x807251c</ref></class> <name>da2</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80b8700</ref> - <geom><ref>0x80b86c0</ref></geom> - <provider><ref>0x80b8200</ref></provider> + <ref>0x80b82c0</ref> + <geom><ref>0x80b9a80</ref></geom> + <provider><ref>0x80b8140</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80b87c0</ref> - <geom><ref>0x80b86c0</ref></geom> + <ref>0x80b9d00</ref> + <geom><ref>0x80b9a80</ref></geom> <mode>r0w0e0</mode> <name>da2c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>74027520</length> <seclength>144585</seclength> @@ -212,11 +215,12 @@ </config> </provider> <provider> - <ref>0x80b8780</ref> - <geom><ref>0x80b86c0</ref></geom> + <ref>0x80b9c80</ref> + <geom><ref>0x80b9a80</ref></geom> <mode>r0w0e0</mode> <name>da2b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>4178442240</length> <seclength>8161020</seclength> @@ -225,11 +229,12 @@ </config> </provider> <provider> - <ref>0x80b8740</ref> - <geom><ref>0x80b86c0</ref></geom> + <ref>0x80b9c00</ref> + <geom><ref>0x80b9a80</ref></geom> <mode>r0w0e0</mode> <name>da2a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>24675840</length> <seclength>48195</seclength> @@ -239,26 +244,29 @@ </provider> </geom> <geom> - <ref>0x80b8480</ref> - <class><ref>0x80722a0</ref></class> + <ref>0x80b9600</ref> + <class><ref>0x807251c</ref></class> <name>da1</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80b84c0</ref> - <geom><ref>0x80b8480</ref></geom> - <provider><ref>0x80b8140</ref></provider> + <ref>0x80b8240</ref> + <geom><ref>0x80b9600</ref></geom> + <provider><ref>0x80b80c0</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80b8600</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9980</ref> + <geom><ref>0x80b9600</ref></geom> <mode>r0w0e0</mode> <name>da1f</name> <config> + <frontstuff>8192</frontstuff> <index>5</index> <length>16951073792</length> <seclength>33107566</seclength> @@ -267,11 +275,12 @@ </config> </provider> <provider> - <ref>0x80b85c0</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9900</ref> + <geom><ref>0x80b9600</ref></geom> <mode>r0w0e0</mode> <name>da1e</name> <config> + <frontstuff>8192</frontstuff> <index>4</index> <length>20971520</length> <seclength>40960</seclength> @@ -280,11 +289,12 @@ </config> </provider> <provider> - <ref>0x80b8580</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9880</ref> + <geom><ref>0x80b9600</ref></geom> <mode>r0w0e0</mode> <name>da1c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>18309995520</length> <seclength>35761710</seclength> @@ -293,11 +303,12 @@ </config> </provider> <provider> - <ref>0x80b8540</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9800</ref> + <geom><ref>0x80b9600</ref></geom> <mode>r0w0e0</mode> <name>da1b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>1086291968</length> <seclength>2121664</seclength> @@ -306,11 +317,12 @@ </config> </provider> <provider> - <ref>0x80b8500</ref> - <geom><ref>0x80b8480</ref></geom> + <ref>0x80b9780</ref> + <geom><ref>0x80b9600</ref></geom> <mode>r0w0e0</mode> <name>da1a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>251658240</length> <seclength>491520</seclength> @@ -320,26 +332,29 @@ </provider> </geom> <geom> - <ref>0x80b82c0</ref> - <class><ref>0x80722a0</ref></class> + <ref>0x80b9200</ref> + <class><ref>0x807251c</ref></class> <name>da0</name> <rank>2</rank> <config> + <frontstuff>8192</frontstuff> </config> <consumer> - <ref>0x80b8300</ref> - <geom><ref>0x80b82c0</ref></geom> - <provider><ref>0x80b8080</ref></provider> + <ref>0x80b81c0</ref> + <geom><ref>0x80b9200</ref></geom> + <provider><ref>0x80b8040</ref></provider> <mode>r0w0e0</mode> <config> + <frontstuff>8192</frontstuff> </config> </consumer> <provider> - <ref>0x80b83c0</ref> - <geom><ref>0x80b82c0</ref></geom> + <ref>0x80b9500</ref> + <geom><ref>0x80b9200</ref></geom> <mode>r0w0e0</mode> <name>da0c</name> <config> + <frontstuff>8192</frontstuff> <index>2</index> <length>4335206400</length> <seclength>8467200</seclength> @@ -348,11 +363,12 @@ </config> </provider> <provider> - <ref>0x80b8380</ref> - <geom><ref>0x80b82c0</ref></geom> + <ref>0x80b9480</ref> + <geom><ref>0x80b9200</ref></geom> <mode>r0w0e0</mode> <name>da0b</name> <config> + <frontstuff>8192</frontstuff> <index>1</index> <length>270925824</length> <seclength>529152</seclength> @@ -361,11 +377,12 @@ </config> </provider> <provider> - <ref>0x80b8340</ref> - <geom><ref>0x80b82c0</ref></geom> + <ref>0x80b9400</ref> + <geom><ref>0x80b9200</ref></geom> <mode>r0w0e0</mode> <name>da0a</name> <config> + <frontstuff>8192</frontstuff> <index>0</index> <length>4064280576</length> <seclength>7938048</seclength> @@ -376,40 +393,40 @@ </geom> </class> <class> - <ref>0x8072120</ref> + <ref>0x807240c</ref> <name>SIMDISK-class</name> <geom> - <ref>0x80b81c0</ref> - <class><ref>0x8072120</ref></class> + <ref>0x80b9100</ref> + <class><ref>0x807240c</ref></class> <name>da2</name> <rank>1</rank> <provider> - <ref>0x80b8200</ref> - <geom><ref>0x80b81c0</ref></geom> + <ref>0x80b8140</ref> + <geom><ref>0x80b9100</ref></geom> <mode>r0w0e0</mode> <name>da2</name> </provider> </geom> <geom> - <ref>0x80b8100</ref> - <class><ref>0x8072120</ref></class> + <ref>0x80b9080</ref> + <class><ref>0x807240c</ref></class> <name>da1</name> <rank>1</rank> <provider> - <ref>0x80b8140</ref> - <geom><ref>0x80b8100</ref></geom> + <ref>0x80b80c0</ref> + <geom><ref>0x80b9080</ref></geom> <mode>r0w0e0</mode> <name>da1</name> </provider> </geom> <geom> - <ref>0x80b8040</ref> - <class><ref>0x8072120</ref></class> + <ref>0x80b9000</ref> + <class><ref>0x807240c</ref></class> <name>da0</name> <rank>1</rank> <provider> - <ref>0x80b8080</ref> - <geom><ref>0x80b8040</ref></geom> + <ref>0x80b8040</ref> + <geom><ref>0x80b9000</ref></geom> <mode>r0w0e0</mode> <name>da0</name> </provider> diff --git a/tools/regression/geom/geom_kernsim.c b/tools/regression/geom/geom_kernsim.c index de87bfc..ba3ccf6 100644 --- a/tools/regression/geom/geom_kernsim.c +++ b/tools/regression/geom/geom_kernsim.c @@ -104,7 +104,7 @@ wakeup(void *chan) secrethandshake(); for (i = 0; i < NTHREAD; i++) if (thr[i].wchan == chan) { - // printf("wakeup %s\n", thr[i].name); + printf("wakeup %s\n", thr[i].name); atomic_clear_int(&sleeping, 1 << i); write(thr[i].pipe[1], "\0", 1); } @@ -136,13 +136,13 @@ tsleep(void *chan, int pri __unused, const char *wmesg, int timo) tp->wchan = chan; tp->wmesg = wmesg; fd = tp->pipe[0]; - // printf("tsleep %s %p %s\n", tp->name, chan, wmesg); + printf("tsleep %s %p %s\n", tp->name, chan, wmesg); for (;;) { if (timo > 0) { tv.tv_sec = 1; tv.tv_usec = 0; } else { - tv.tv_sec = 10; + tv.tv_sec = 3; tv.tv_usec = 0; } FD_ZERO(&r); @@ -152,11 +152,10 @@ tsleep(void *chan, int pri __unused, const char *wmesg, int timo) atomic_set_int(&sleeping, 1 << i); j = select(fd + 1, &r, &w, &e, &tv); secrethandshake(); - if (j) - break; - atomic_set_int(&sleeping, 1 << i); + break; } - i = read(fd, buf, sizeof(buf)); + if (j) + i = read(fd, buf, sizeof(buf)); tp->wchan = 0; tp->wmesg = 0; return(i); @@ -169,7 +168,7 @@ rattle() for (;;) { secrethandshake(); - usleep(100000); + usleep(500000); secrethandshake(); i = sleeping & 7; if (i != 7) @@ -311,7 +310,7 @@ mtx_unlock_spin(struct mtx *mp) } void -mtx_init(struct mtx *mp, char *bla __unused, int foo __unused) +mtx_init(struct mtx *mp, const char *bla __unused, const char *yak __unused, int foo __unused) { mp->mtx_lock = 0; } diff --git a/tools/regression/geom/geom_sim.h b/tools/regression/geom/geom_sim.h index 4350f1d..df08220 100644 --- a/tools/regression/geom/geom_sim.h +++ b/tools/regression/geom/geom_sim.h @@ -60,7 +60,7 @@ struct bio { off_t bio_length; off_t bio_completed; void *bio_data; - char *bio_attribute; /* BIO_GETATTR/BIO_SETATTR */ + const char *bio_attribute; /* BIO_GETATTR/BIO_SETATTR */ int bio_error; struct bio *bio_linkage; @@ -107,7 +107,7 @@ void mtx_lock(struct mtx *); void mtx_lock_spin(struct mtx *); void mtx_unlock(struct mtx *); void mtx_unlock_spin(struct mtx *); -void mtx_init(struct mtx *, char *, int); +void mtx_init(struct mtx *, const char *, const char *, int); void mtx_destroy(struct mtx *); #define MALLOC_DECLARE(foo) /* */ |