52 files changed, 12 insertions, 40 deletions
diff --git a/test/sys/block/cciss!c0d0/cciss!c0d0p1/dev b/test/sys/block/cciss!c0d0/cciss!c0d0p1/dev
deleted file mode 100644
index 92c4b9b088..0000000000
--- a/test/sys/block/cciss!c0d0/cciss!c0d0p1/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:1
diff --git a/test/sys/block/cciss!c0d0/cciss!c0d0p2/dev b/test/sys/block/cciss!c0d0/cciss!c0d0p2/dev
deleted file mode 100644
index 9799a2674a..0000000000
--- a/test/sys/block/cciss!c0d0/cciss!c0d0p2/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:2
diff --git a/test/sys/block/cciss!c0d0/cciss!c0d0p5/dev b/test/sys/block/cciss!c0d0/cciss!c0d0p5/dev
deleted file mode 100644
index b3d5042192..0000000000
--- a/test/sys/block/cciss!c0d0/cciss!c0d0p5/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:5
diff --git a/test/sys/block/cciss!c0d0/dev b/test/sys/block/cciss!c0d0/dev
deleted file mode 100644
index fae0a50572..0000000000
--- a/test/sys/block/cciss!c0d0/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:0
diff --git a/test/sys/block/cciss!c0d0/device b/test/sys/block/cciss!c0d0/device
deleted file mode 120000
index 485bf09f61..0000000000
--- a/test/sys/block/cciss!c0d0/device
+++ /dev/null
@@ -1 +0,0 @@
-../../devices/pci0000:00/0000:00:1e.0/0000:02:05.0/host0/target0:0:0/0:0:0:0
-\ No newline at end of file
diff --git a/test/sys/block/loop0 b/test/sys/block/loop0
new file mode 120000
index 0000000000..caf270b78b
--- /dev/null
+++ b/test/sys/block/loop0
@@ -0,0 +1 @@
+../devices/virtual/block/loop0
+\ No newline at end of file
diff --git a/test/sys/block/loop1 b/test/sys/block/loop1
new file mode 120000
index 0000000000..ad28556992
--- /dev/null
+++ b/test/sys/block/loop1
@@ -0,0 +1 @@
+../devices/virtual/block/loop1
+\ No newline at end of file
diff --git a/test/sys/block/loop2 b/test/sys/block/loop2
new file mode 120000
index 0000000000..cd6da29c2f
--- /dev/null
+++ b/test/sys/block/loop2
@@ -0,0 +1 @@
+../devices/virtual/block/loop2
+\ No newline at end of file
diff --git a/test/sys/block/loop3 b/test/sys/block/loop3
new file mode 120000
index 0000000000..69a4794dbb
--- /dev/null
+++ b/test/sys/block/loop3
@@ -0,0 +1 @@
+../devices/virtual/block/loop3
+\ No newline at end of file
diff --git a/test/sys/block/loop4 b/test/sys/block/loop4
new file mode 120000
index 0000000000..8244471b16
--- /dev/null
+++ b/test/sys/block/loop4
@@ -0,0 +1 @@
+../devices/virtual/block/loop4
+\ No newline at end of file
diff --git a/test/sys/block/loop5 b/test/sys/block/loop5
new file mode 120000
index 0000000000..9b436c9d67
--- /dev/null
+++ b/test/sys/block/loop5
@@ -0,0 +1 @@
+../devices/virtual/block/loop5
+\ No newline at end of file
diff --git a/test/sys/block/loop6 b/test/sys/block/loop6
new file mode 120000
index 0000000000..b968dfdabb
--- /dev/null
+++ b/test/sys/block/loop6
@@ -0,0 +1 @@
+../devices/virtual/block/loop6
+\ No newline at end of file
diff --git a/test/sys/block/loop7 b/test/sys/block/loop7
new file mode 120000
index 0000000000..947b66f25c
--- /dev/null
+++ b/test/sys/block/loop7
@@ -0,0 +1 @@
+../devices/virtual/block/loop7
+\ No newline at end of file
diff --git a/test/sys/block/md0 b/test/sys/block/md0
new file mode 120000
index 0000000000..2a12b5d3fa
--- /dev/null
+++ b/test/sys/block/md0
@@ -0,0 +1 @@
+../devices/virtual/block/md0
+\ No newline at end of file
diff --git a/test/sys/block/rd!c0d0/dev b/test/sys/block/rd!c0d0/dev
deleted file mode 100644
index fae0a50572..0000000000
--- a/test/sys/block/rd!c0d0/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:0
diff --git a/test/sys/block/rd!c0d0/device b/test/sys/block/rd!c0d0/device
deleted file mode 120000
index 485bf09f61..0000000000
--- a/test/sys/block/rd!c0d0/device
+++ /dev/null
@@ -1 +0,0 @@
-../../devices/pci0000:00/0000:00:1e.0/0000:02:05.0/host0/target0:0:0/0:0:0:0
-\ No newline at end of file
diff --git a/test/sys/block/sda b/test/sys/block/sda
new file mode 120000
index 0000000000..623767d6b6
--- /dev/null
+++ b/test/sys/block/sda
@@ -0,0 +1 @@
+../devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda
+\ No newline at end of file
diff --git a/test/sys/block/sda/dev b/test/sys/block/sda/dev
deleted file mode 100644
index fae0a50572..0000000000
--- a/test/sys/block/sda/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:0
diff --git a/test/sys/block/sda/device b/test/sys/block/sda/device
deleted file mode 120000
index 485bf09f61..0000000000
--- a/test/sys/block/sda/device
+++ /dev/null
@@ -1 +0,0 @@
-../../devices/pci0000:00/0000:00:1e.0/0000:02:05.0/host0/target0:0:0/0:0:0:0
-\ No newline at end of file
diff --git a/test/sys/block/sda/queue/iosched/antic_expire b/test/sys/block/sda/queue/iosched/antic_expire
deleted file mode 100644
index 1e8b314962..0000000000
--- a/test/sys/block/sda/queue/iosched/antic_expire
+++ /dev/null
@@ -1 +0,0 @@
-6
diff --git a/test/sys/block/sda/queue/iosched/read_batch_expire b/test/sys/block/sda/queue/iosched/read_batch_expire
deleted file mode 100644
index 08839f6bb2..0000000000
--- a/test/sys/block/sda/queue/iosched/read_batch_expire
+++ /dev/null
@@ -1 +0,0 @@
-200
diff --git a/test/sys/block/sda/queue/iosched/read_expire b/test/sys/block/sda/queue/iosched/read_expire
deleted file mode 100644
index e373ee695f..0000000000
--- a/test/sys/block/sda/queue/iosched/read_expire
+++ /dev/null
@@ -1 +0,0 @@
-50
diff --git a/test/sys/block/sda/queue/iosched/write_batch_expire b/test/sys/block/sda/queue/iosched/write_batch_expire
deleted file mode 100644
index e373ee695f..0000000000
--- a/test/sys/block/sda/queue/iosched/write_batch_expire
+++ /dev/null
@@ -1 +0,0 @@
-50
diff --git a/test/sys/block/sda/queue/iosched/write_expire b/test/sys/block/sda/queue/iosched/write_expire
deleted file mode 100644
index 08839f6bb2..0000000000
--- a/test/sys/block/sda/queue/iosched/write_expire
+++ /dev/null
@@ -1 +0,0 @@
-200
diff --git a/test/sys/block/sda/queue/nr_requests b/test/sys/block/sda/queue/nr_requests
deleted file mode 100644
index a949a93dfc..0000000000
--- a/test/sys/block/sda/queue/nr_requests
+++ /dev/null
@@ -1 +0,0 @@
-128
diff --git a/test/sys/block/sda/range b/test/sys/block/sda/range
deleted file mode 100644
index b6a7d89c68..0000000000
--- a/test/sys/block/sda/range
+++ /dev/null
@@ -1 +0,0 @@
-16
diff --git a/test/sys/block/sda/sda1/dev b/test/sys/block/sda/sda1/dev
deleted file mode 100644
index 92c4b9b088..0000000000
--- a/test/sys/block/sda/sda1/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:1
diff --git a/test/sys/block/sda/sda1/size b/test/sys/block/sda/sda1/size
deleted file mode 100644
index f00a59241e..0000000000
--- a/test/sys/block/sda/sda1/size
+++ /dev/null
@@ -1 +0,0 @@
-1060227
diff --git a/test/sys/block/sda/sda1/start b/test/sys/block/sda/sda1/start
deleted file mode 100644
index 4b9026d8e2..0000000000
--- a/test/sys/block/sda/sda1/start
+++ /dev/null
@@ -1 +0,0 @@
-63
diff --git a/test/sys/block/sda/sda1/stat b/test/sys/block/sda/sda1/stat
deleted file mode 100644
index 199ce7330b..0000000000
--- a/test/sys/block/sda/sda1/stat
+++ /dev/null
@@ -1 +0,0 @@
-      50      400      103      824
diff --git a/test/sys/block/sda/sda1/subsystem b/test/sys/block/sda/sda1/subsystem
deleted file mode 120000
index bc3873f9ee..0000000000
--- a/test/sys/block/sda/sda1/subsystem
+++ /dev/null
@@ -1 +0,0 @@
-../../../block
-\ No newline at end of file
diff --git a/test/sys/block/sda/sda2/dev b/test/sys/block/sda/sda2/dev
deleted file mode 100644
index 9799a2674a..0000000000
--- a/test/sys/block/sda/sda2/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:2
diff --git a/test/sys/block/sda/sda2/size b/test/sys/block/sda/sda2/size
deleted file mode 100644
index 80483ab968..0000000000
--- a/test/sys/block/sda/sda2/size
+++ /dev/null
@@ -1 +0,0 @@
-112455
diff --git a/test/sys/block/sda/sda2/start b/test/sys/block/sda/sda2/start
deleted file mode 100644
index 3a4bf076fc..0000000000
--- a/test/sys/block/sda/sda2/start
+++ /dev/null
@@ -1 +0,0 @@
-1060290
diff --git a/test/sys/block/sda/sda2/stat b/test/sys/block/sda/sda2/stat
deleted file mode 100644
index c06b749cd1..0000000000
--- a/test/sys/block/sda/sda2/stat
+++ /dev/null
@@ -1 +0,0 @@
-     342      500       15       30
diff --git a/test/sys/block/sda/sda2/subsystem b/test/sys/block/sda/sda2/subsystem
deleted file mode 120000
index bc3873f9ee..0000000000
--- a/test/sys/block/sda/sda2/subsystem
+++ /dev/null
@@ -1 +0,0 @@
-../../../block
-\ No newline at end of file
diff --git a/test/sys/block/sda/sda3/dev b/test/sys/block/sda/sda3/dev
deleted file mode 100644
index 44ccff41b0..0000000000
--- a/test/sys/block/sda/sda3/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:3
diff --git a/test/sys/block/sda/sda3/size b/test/sys/block/sda/sda3/size
deleted file mode 100644
index 1373b38f8d..0000000000
--- a/test/sys/block/sda/sda3/size
+++ /dev/null
@@ -1 +0,0 @@
-20482875
diff --git a/test/sys/block/sda/sda3/start b/test/sys/block/sda/sda3/start
deleted file mode 100644
index cab5c33336..0000000000
--- a/test/sys/block/sda/sda3/start
+++ /dev/null
@@ -1 +0,0 @@
-1172745
diff --git a/test/sys/block/sda/sda3/stat b/test/sys/block/sda/sda3/stat
deleted file mode 100644
index 82fb1463a1..0000000000
--- a/test/sys/block/sda/sda3/stat
+++ /dev/null
@@ -1 +0,0 @@
-  415052  6872874   669740  5357920
diff --git a/test/sys/block/sda/sda3/subsystem b/test/sys/block/sda/sda3/subsystem
deleted file mode 120000
index bc3873f9ee..0000000000
--- a/test/sys/block/sda/sda3/subsystem
+++ /dev/null
@@ -1 +0,0 @@
-../../../block
-\ No newline at end of file
diff --git a/test/sys/block/sda/sda4/dev b/test/sys/block/sda/sda4/dev
deleted file mode 100644
index aab3fc56e1..0000000000
--- a/test/sys/block/sda/sda4/dev
+++ /dev/null
@@ -1 +0,0 @@
-8:4
diff --git a/test/sys/block/sda/sda4/size b/test/sys/block/sda/sda4/size
deleted file mode 100644
index 062619c44b..0000000000
--- a/test/sys/block/sda/sda4/size
+++ /dev/null
@@ -1 +0,0 @@
-49432005
diff --git a/test/sys/block/sda/sda4/start b/test/sys/block/sda/sda4/start
deleted file mode 100644
index b65020c801..0000000000
--- a/test/sys/block/sda/sda4/start
+++ /dev/null
@@ -1 +0,0 @@
-21655620
diff --git a/test/sys/block/sda/sda4/stat b/test/sys/block/sda/sda4/stat
deleted file mode 100644
index 3e7b7ad75c..0000000000
--- a/test/sys/block/sda/sda4/stat
+++ /dev/null
@@ -1 +0,0 @@
-  642730  9095506   275223  2201728
diff --git a/test/sys/block/sda/sda4/subsystem b/test/sys/block/sda/sda4/subsystem
deleted file mode 120000
index bc3873f9ee..0000000000
--- a/test/sys/block/sda/sda4/subsystem
+++ /dev/null
@@ -1 +0,0 @@
-../../../block
-\ No newline at end of file
diff --git a/test/sys/block/sda/size b/test/sys/block/sda/size
deleted file mode 100644
index 88da032f61..0000000000
--- a/test/sys/block/sda/size
+++ /dev/null
@@ -1 +0,0 @@
-71096640
diff --git a/test/sys/block/sda/stat b/test/sys/block/sda/stat
deleted file mode 100644
index b93c7d4ac4..0000000000
--- a/test/sys/block/sda/stat
+++ /dev/null
@@ -1 +0,0 @@
- 1043906    19157 16008400  4313104   317001   625161  7560502 48785829        0  3846686 53153390
diff --git a/test/sys/block/sda/subsystem b/test/sys/block/sda/subsystem
deleted file mode 120000
index f33eb2721f..0000000000
--- a/test/sys/block/sda/subsystem
+++ /dev/null
@@ -1 +0,0 @@
-../../block
-\ No newline at end of file
diff --git a/test/sys/block/sda/test:colon+plus b/test/sys/block/sda/test:colon+plus
deleted file mode 100644
index 0fed9a5d60..0000000000
--- a/test/sys/block/sda/test:colon+plus
+++ /dev/null
@@ -1 +0,0 @@
-colon
diff --git a/test/sys/block/sdb b/test/sys/block/sdb
new file mode 120000
index 0000000000..8b7c0c4713
--- /dev/null
+++ b/test/sys/block/sdb
@@ -0,0 +1 @@
+../devices/pci0000:00/0000:00:1d.7/usb5/5-2/5-2:1.0/host6/target6:0:0/6:0:0:0/block/sdb
+\ No newline at end of file
diff --git a/test/sys/block/sr0 b/test/sys/block/sr0
new file mode 120000
index 0000000000..c61fe209d6
--- /dev/null
+++ b/test/sys/block/sr0
@@ -0,0 +1 @@
+../devices/pci0000:00/0000:00:1f.1/host4/target4:0:0/4:0:0:0/block/sr0
+\ No newline at end of file