diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 6a69f92020..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index d00491fd7e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 6a69f92020..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 0cfbf08886..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings
deleted file mode 100644
index 654412338e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f00
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index d411bb7c1a..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-400
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings
deleted file mode 100644
index 654412338e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f00
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index 5ae5aef844..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-800
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings
deleted file mode 100644
index a830edd60e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index 83b33d238d..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-1000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings
deleted file mode 100644
index a830edd60e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index 8bd1af11bf..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-2000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings
deleted file mode 100644
index a830edd60e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index 26a4dd33f0..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-4000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings
deleted file mode 100644
index a830edd60e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index e002b3628b..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-8000
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 6a69f92020..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index b8626c4cff..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 6a69f92020..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index 45a4fb75db..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-8
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index 844dc808a1..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f0
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index f599e28b8a..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index 844dc808a1..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f0
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 209e3ef4b6..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 844dc808a1..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f0
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 425151f3a4..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-40
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index 844dc808a1..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f0
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d15a2cc44e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-80
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index 654412338e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f00
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 29d6383b52..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings
deleted file mode 100644
index 654412338e..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-f00
diff --git a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 08839f6bb2..0000000000
--- a/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-200
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index b4de394767..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 2bd5a0a98a..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-22
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index c739b42c4d..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index d22307c427..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-88
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index b4de394767..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 2bd5a0a98a..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-22
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index c739b42c4d..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d22307c427..0000000000
--- a/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-88
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 5325a8dff7..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-001
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 5325a8dff7..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-001
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 5325a8dff7..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-001
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 5325a8dff7..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-001
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 5325a8dff7..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-001
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5902f77e7e..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-002
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index d411bb7c1a..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-400
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index 5ae5aef844..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-800
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 8f3cca4f01..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-004
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index e195199bee..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-008
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 9e8493eaee..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-010
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index d37ac748bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index fb6187e9e0..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-020
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 9070bc3017..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-040
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index fa5c7835bd..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-080
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 29d6383b52..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
deleted file mode 100644
index 6c3274debe..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 08839f6bb2..0000000000
--- a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-200
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings
deleted file mode 100644
index 267b16128b..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings
deleted file mode 100644
index b4fa391afc..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings
deleted file mode 100644
index 267b16128b..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings
deleted file mode 100644
index 968e322553..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings
deleted file mode 100644
index 99374e82c7..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings
deleted file mode 100644
index 13eaaf3a6f..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings
deleted file mode 100644
index 99374e82c7..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings
deleted file mode 100644
index 7e18bfba5e..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings
deleted file mode 100644
index 99374e82c7..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings
deleted file mode 100644
index c05c51e5af..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings
deleted file mode 100644
index 94bd36693b..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index f15bff666a..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings
deleted file mode 100644
index 94bd36693b..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings
deleted file mode 100644
index c20308b25f..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings
deleted file mode 100644
index 24976fcc65..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00010100,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index d98f0b4cbf..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings
deleted file mode 100644
index 24976fcc65..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00010100,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings
deleted file mode 100644
index 943a83ab94..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings
deleted file mode 100644
index 24976fcc65..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00010100,00000000
diff --git a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings b/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings
deleted file mode 100644
index b85a0fd6df..0000000000
--- a/tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 75016ea362..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 8a0f05e166..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-01
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 75016ea362..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-03
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 9e22bcb8e3..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-02
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 8ac4b4ca54..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0c
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 64969239d5..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-04
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 8ac4b4ca54..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0c
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index adb9de8ee0..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-08
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index 64bb6b746d..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-30
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index f599e28b8a..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index 64bb6b746d..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-30
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 209e3ef4b6..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index caecf05cdb..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-c0
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 425151f3a4..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-40
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index caecf05cdb..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-c0
diff --git a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d15a2cc44e..0000000000
--- a/tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-80
diff --git a/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index d00491fd7e..0000000000
--- a/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index d00491fd7e..0000000000
--- a/tests/virhostcpudata/linux-raspberrypi/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 8a0f05e166..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-01
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 9e22bcb8e3..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-02
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 64969239d5..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-04
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index adb9de8ee0..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-08
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index f599e28b8a..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 209e3ef4b6..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-20
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 425151f3a4..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-40
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index fcd15acf93..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-ff
diff --git a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d15a2cc44e..0000000000
--- a/tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-80
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 82fbe1e315..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 996d0e7556..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 564f3d3fe5..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000004
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index a5d133f4cd..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000008
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 2395421d7b..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 3183c82303..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000020
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 7f45304c3d..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000040
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index e445f14f1a..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index 49fc86d361..0000000000
--- a/tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000080
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index b7ec4e66cf..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/thread_siblings
deleted file mode 100644
index b4fa391afc..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/thread_siblings
deleted file mode 100644
index 968e322553..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/core_siblings
deleted file mode 100644
index 50fc716969..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/thread_siblings
deleted file mode 100644
index 13eaaf3a6f..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/core_siblings
deleted file mode 100644
index 50fc716969..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/thread_siblings
deleted file mode 100644
index 7e18bfba5e..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/core_siblings
deleted file mode 100644
index 50fc716969..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/thread_siblings
deleted file mode 100644
index c05c51e5af..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/core_siblings
deleted file mode 100644
index 50fc716969..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/thread_siblings
deleted file mode 100644
index 5630ba05f4..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/core_siblings
deleted file mode 100644
index 50fc716969..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01010101,01000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/thread_siblings
deleted file mode 100644
index 4602fcbb61..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index f15bff666a..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/thread_siblings
deleted file mode 100644
index c20308b25f..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/thread_siblings
deleted file mode 100644
index 086b155287..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/core_siblings
deleted file mode 100644
index 513d74eb20..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index d98f0b4cbf..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/core_siblings
deleted file mode 100644
index 513d74eb20..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/thread_siblings
deleted file mode 100644
index 943a83ab94..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/core_siblings
deleted file mode 100644
index 513d74eb20..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/thread_siblings
deleted file mode 100644
index d25e217d16..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/core_siblings
deleted file mode 100644
index 513d74eb20..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/thread_siblings
deleted file mode 100644
index 2e6a2512ae..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/core_siblings
deleted file mode 100644
index 513d74eb20..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/thread_siblings
deleted file mode 100644
index b85a0fd6df..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index ffeb50380f..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/thread_siblings
deleted file mode 100644
index 17461e4dcd..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/thread_siblings
deleted file mode 100644
index 8aa7b77c3c..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/core_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/thread_siblings b/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/thread_siblings
deleted file mode 100644
index d5d4a45157..0000000000
--- a/tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index b7ec4e66cf..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/thread_siblings
deleted file mode 100644
index b4fa391afc..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/thread_siblings
deleted file mode 100644
index 968e322553..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/core_siblings
deleted file mode 100644
index 379bb52b2e..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/thread_siblings
deleted file mode 100644
index 7e18bfba5e..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/core_siblings
deleted file mode 100644
index c05c51e5af..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/thread_siblings
deleted file mode 100644
index c05c51e5af..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index f15bff666a..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/thread_siblings
deleted file mode 100644
index c20308b25f..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/thread_siblings
deleted file mode 100644
index 086b155287..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/core_siblings
deleted file mode 100644
index 75e64d3972..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index d98f0b4cbf..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/core_siblings
deleted file mode 100644
index 943a83ab94..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/thread_siblings
deleted file mode 100644
index 943a83ab94..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/core_siblings
deleted file mode 100644
index 75e64d3972..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/thread_siblings
deleted file mode 100644
index d25e217d16..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/core_siblings
deleted file mode 100644
index 75e64d3972..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/thread_siblings
deleted file mode 100644
index b85a0fd6df..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index 54d3782ed2..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,01010101
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index ffeb50380f..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/thread_siblings
deleted file mode 100644
index 17461e4dcd..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/thread_siblings
deleted file mode 100644
index 8aa7b77c3c..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/core_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/core_siblings
deleted file mode 100644
index d5d4a45157..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/thread_siblings b/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/thread_siblings
deleted file mode 100644
index d5d4a45157..0000000000
--- a/tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/thread_siblings
deleted file mode 100644
index b4fa391afc..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/thread_siblings
deleted file mode 100644
index 968e322553..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/thread_siblings
deleted file mode 100644
index 7e18bfba5e..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/thread_siblings
deleted file mode 100644
index c05c51e5af..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/core_siblings
deleted file mode 100644
index 2d19993207..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000101,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/thread_siblings
deleted file mode 100644
index 79ef01bc68..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,ff000000,00000000,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/core_siblings
deleted file mode 100644
index 226dfb1743..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000110,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index d98f0b4cbf..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/core_siblings
deleted file mode 100644
index 226dfb1743..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000110,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/thread_siblings
deleted file mode 100644
index 943a83ab94..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/core_siblings
deleted file mode 100644
index 226dfb1743..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000110,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/thread_siblings
deleted file mode 100644
index d25e217d16..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/core_siblings
deleted file mode 100644
index 226dfb1743..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000110,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/thread_siblings
deleted file mode 100644
index 41e89b2e05..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000010,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/core_siblings
deleted file mode 100644
index 226dfb1743..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000110,01010100,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/thread_siblings
deleted file mode 100644
index b85a0fd6df..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/core_siblings
deleted file mode 100644
index ffeb50380f..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index ffeb50380f..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000100
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/thread_siblings
deleted file mode 100644
index 17461e4dcd..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/thread_siblings
deleted file mode 100644
index 8aa7b77c3c..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,01000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/core_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/core_siblings
deleted file mode 100644
index c98a5a2856..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00010101,01010000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/thread_siblings b/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/thread_siblings
deleted file mode 100644
index d5d4a45157..0000000000
--- a/tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001,00000000,00000000,00000000
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index b9ad9ed2ca..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index d347603971..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu1/core_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu1/core_siblings
deleted file mode 100644
index b9ad9ed2ca..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu1/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu1/thread_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu1/thread_siblings
deleted file mode 100644
index 0af11c5521..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu1/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000002
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index b9ad9ed2ca..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000003
diff --git a/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index d347603971..0000000000
--- a/tests/virhostcpudata/linux-test1/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000001
diff --git a/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 176d3d66a8..0000000000
--- a/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 6dcc80c765..0000000000
--- a/tests/virhostcpudata/linux-test2/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000001
diff --git a/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 176d3d66a8..0000000000
--- a/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5e249253ba..0000000000
--- a/tests/virhostcpudata/linux-test2/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000002
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 8edc2d5ec3..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000001
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 0634069539..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000002
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index 63952a2105..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000400
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index ceaaaf4369..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000800
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu12/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index 4154eaf1c0..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00001000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu13/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index b6eb266961..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00002000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu14/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index da4349c48e..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00004000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu15/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index 446c0dbcf4..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00008000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index 076f20afaa..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00010000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu17/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu17/topology/thread_siblings
deleted file mode 100644
index fe44ad04e1..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu17/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00020000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu18/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu18/topology/thread_siblings
deleted file mode 100644
index dd2865ab1e..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu18/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00040000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu19/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu19/topology/thread_siblings
deleted file mode 100644
index 223476db73..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu19/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00080000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index 56020529cd..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000004
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu20/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu20/topology/thread_siblings
deleted file mode 100644
index 1430c2a383..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu20/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00100000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu21/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu21/topology/thread_siblings
deleted file mode 100644
index 61bd497528..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu21/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00200000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu22/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu22/topology/thread_siblings
deleted file mode 100644
index 3ec5eb3b9c..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu22/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00400000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu23/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu23/topology/thread_siblings
deleted file mode 100644
index fa274e5800..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu23/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00800000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu24/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu24/topology/thread_siblings
deleted file mode 100644
index deb22016fa..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu24/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,01000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu25/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu25/topology/thread_siblings
deleted file mode 100644
index 74477b2f22..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu25/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,02000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu26/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu26/topology/thread_siblings
deleted file mode 100644
index a2e8879e5b..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu26/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,04000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu27/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu27/topology/thread_siblings
deleted file mode 100644
index e3209fc123..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu27/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,08000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu28/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu28/topology/thread_siblings
deleted file mode 100644
index 9bfa3743f1..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu28/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,10000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu29/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu29/topology/thread_siblings
deleted file mode 100644
index b65ea83c8a..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu29/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,20000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index c44947f14c..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000008
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu30/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu30/topology/thread_siblings
deleted file mode 100644
index 078ce19830..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu30/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,40000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu31/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu31/topology/thread_siblings
deleted file mode 100644
index b20c7d89b9..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu31/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,80000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu32/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu32/topology/thread_siblings
deleted file mode 100644
index 81958e4785..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu32/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000001,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu33/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu33/topology/thread_siblings
deleted file mode 100644
index 9db6e69fc7..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu33/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000002,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu34/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu34/topology/thread_siblings
deleted file mode 100644
index 9a6ffb5433..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu34/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000004,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu35/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu35/topology/thread_siblings
deleted file mode 100644
index 66802a0b3f..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu35/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000008,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu36/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu36/topology/thread_siblings
deleted file mode 100644
index b973ea5c82..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu36/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000010,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu37/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu37/topology/thread_siblings
deleted file mode 100644
index 1f7a88bf2e..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu37/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000020,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu38/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu38/topology/thread_siblings
deleted file mode 100644
index 80fff8b647..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu38/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000040,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu39/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu39/topology/thread_siblings
deleted file mode 100644
index 68a532fffc..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu39/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000080,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index f3a63ad21f..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000010
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index 18c9678793..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000100,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu41/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu41/topology/thread_siblings
deleted file mode 100644
index a9dbc92363..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu41/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000200,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu42/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu42/topology/thread_siblings
deleted file mode 100644
index 5332d8b348..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu42/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000400,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu43/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu43/topology/thread_siblings
deleted file mode 100644
index 54bf8e5508..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu43/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000800,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu44/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu44/topology/thread_siblings
deleted file mode 100644
index 7e4fe584af..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu44/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00001000,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu45/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu45/topology/thread_siblings
deleted file mode 100644
index a2ae18603e..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu45/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00002000,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu46/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu46/topology/thread_siblings
deleted file mode 100644
index e2f5f3be9f..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu46/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00004000,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu47/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu47/topology/thread_siblings
deleted file mode 100644
index 7d9f05ac7c..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu47/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00008000,00000000
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 88893929f8..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000020
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 0c52b986fa..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000040
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index 5f616f7014..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000080
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 94eb5f4603..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000100
diff --git a/tests/virhostcpudata/linux-test3/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-test3/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 2742e43c16..0000000000
--- a/tests/virhostcpudata/linux-test3/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000200
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 635047563b..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0001
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5fca1fda0b..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0002
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index cde5dce24b..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0400
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index 54c33716dc..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0800
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu12/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index 83b33d238d..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-1000
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu13/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index 8bd1af11bf..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-2000
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu14/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index 26a4dd33f0..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-4000
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu15/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index e002b3628b..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-8000
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index e224381915..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0004
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index be15c71fd2..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0008
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 66375d5000..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0010
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 0bfe0202ed..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0020
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index b5fda7b228..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0040
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d46f19798e..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0080
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index e199843fc5..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0100
diff --git a/tests/virhostcpudata/linux-test4/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-test4/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 092ce5f323..0000000000
--- a/tests/virhostcpudata/linux-test4/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0200
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index 96a53c740f..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000f
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 635047563b..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0001
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index 96a53c740f..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000f
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 5fca1fda0b..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0002
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index 96a53c740f..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000f
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index e224381915..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0004
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index 96a53c740f..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-000f
diff --git a/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index be15c71fd2..0000000000
--- a/tests/virhostcpudata/linux-test5/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-0008
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index b4de394767..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 9e22bcb8e3..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-02
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index c739b42c4d..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index adb9de8ee0..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-08
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index b4de394767..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index c739b42c4d..0000000000
--- a/tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 3dc19f2ef4..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000001
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 7d4e089a8e..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000002
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index de0e54d8e0..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000400
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index b1e6e0320d..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000800
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu12/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index 73f3cf7222..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00001000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu13/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index b60939a09e..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00002000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu14/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index 0159580880..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00004000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu15/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index c5e4575ee0..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00008000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index a5a8466a6f..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00010000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu17/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu17/topology/thread_siblings
deleted file mode 100644
index b563c50e54..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu17/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00020000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu18/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu18/topology/thread_siblings
deleted file mode 100644
index 5bae96bcb9..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu18/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00040000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu19/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu19/topology/thread_siblings
deleted file mode 100644
index 03f1958bb0..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu19/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00080000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index bc1eab3cbe..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000004
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu20/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu20/topology/thread_siblings
deleted file mode 100644
index a3242c0a50..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu20/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00100000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu21/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu21/topology/thread_siblings
deleted file mode 100644
index fac7d63f48..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu21/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00200000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu22/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu22/topology/thread_siblings
deleted file mode 100644
index 74389e73ef..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu22/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00400000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu23/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu23/topology/thread_siblings
deleted file mode 100644
index 6c554737df..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu23/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00800000
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index 13c4744a53..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000008
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 5ce9ab8414..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000010
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index ae752a0a3f..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000020
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index 024ff7107c..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000040
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index bb5a722dc7..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000080
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index 5bd120b6fa..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000100
diff --git a/tests/virhostcpudata/linux-test7/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-test7/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 3572438e10..0000000000
--- a/tests/virhostcpudata/linux-test7/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000200
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 726ff29451..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000011
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index ef829e63e2..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000022
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings
deleted file mode 100644
index b7e61e28e1..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00004400
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings
deleted file mode 100644
index afcfdd1d51..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00008800
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings
deleted file mode 100644
index b2ebd260a3..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00001100
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings
deleted file mode 100644
index 052bdcd461..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00002200
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings
deleted file mode 100644
index b7e61e28e1..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00004400
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings
deleted file mode 100644
index afcfdd1d51..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00008800
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings
deleted file mode 100644
index 0804f945e0..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00110000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings
deleted file mode 100644
index 3909fdddbe..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00220000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings
deleted file mode 100644
index db63d7595a..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00440000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings
deleted file mode 100644
index 994c7714df..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00880000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index ee459c2589..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000044
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings
deleted file mode 100644
index 0804f945e0..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00110000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings
deleted file mode 100644
index 3909fdddbe..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00220000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings
deleted file mode 100644
index db63d7595a..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00440000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings
deleted file mode 100644
index 994c7714df..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00880000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings
deleted file mode 100644
index b51865bc9f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,11000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings
deleted file mode 100644
index eb689b4c7f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,22000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings
deleted file mode 100644
index d5d47fce3f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,44000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings
deleted file mode 100644
index c1e0380124..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,88000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings
deleted file mode 100644
index b51865bc9f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,11000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings
deleted file mode 100644
index eb689b4c7f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,22000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index d20a38a0ac..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000088
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings
deleted file mode 100644
index d5d47fce3f..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,44000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings
deleted file mode 100644
index c1e0380124..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,88000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings
deleted file mode 100644
index f9f734ef98..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000011,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings
deleted file mode 100644
index cfd1c72937..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000022,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings
deleted file mode 100644
index ddab079537..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000044,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings
deleted file mode 100644
index ce08d25aa8..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000088,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings
deleted file mode 100644
index f9f734ef98..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000011,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings
deleted file mode 100644
index cfd1c72937..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000022,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings
deleted file mode 100644
index ddab079537..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000044,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings
deleted file mode 100644
index ce08d25aa8..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000088,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 726ff29451..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000011
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings
deleted file mode 100644
index de22d1e8c5..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00001100,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings
deleted file mode 100644
index 4bc8424538..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00002200,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings
deleted file mode 100644
index 9853e27dee..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00004400,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings
deleted file mode 100644
index 3c6aa2d93c..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00008800,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings
deleted file mode 100644
index de22d1e8c5..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00001100,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings
deleted file mode 100644
index 4bc8424538..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00002200,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings
deleted file mode 100644
index 9853e27dee..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00004400,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings
deleted file mode 100644
index 3c6aa2d93c..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00008800,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings
deleted file mode 100644
index 584501b658..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00110000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings
deleted file mode 100644
index ce8483056b..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00220000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index ef829e63e2..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000022
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings
deleted file mode 100644
index bee5410bbc..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00440000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings
deleted file mode 100644
index a35ac6d572..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00880000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings
deleted file mode 100644
index 584501b658..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00110000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings
deleted file mode 100644
index ce8483056b..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00220000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings
deleted file mode 100644
index bee5410bbc..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00440000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings
deleted file mode 100644
index a35ac6d572..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00880000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings
deleted file mode 100644
index 54e7c777db..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings
deleted file mode 100644
index ec8edd8be6..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-22000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings
deleted file mode 100644
index 085c93340c..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings
deleted file mode 100644
index 33c0c329db..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-88000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index ee459c2589..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000044
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings
deleted file mode 100644
index 54e7c777db..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-11000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings
deleted file mode 100644
index ec8edd8be6..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-22000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings
deleted file mode 100644
index 085c93340c..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-44000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings
deleted file mode 100644
index 33c0c329db..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-88000000,00000000
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index d20a38a0ac..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000088
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings
deleted file mode 100644
index b2ebd260a3..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00001100
diff --git a/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings
deleted file mode 100644
index 052bdcd461..0000000000
--- a/tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00002200
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings
deleted file mode 100644
index 176d3d66a8..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings
deleted file mode 100644
index 176d3d66a8..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000003
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings
deleted file mode 100644
index b0f137de27..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings
deleted file mode 100644
index b0f137de27..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,0000000c
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings
deleted file mode 100644
index 294472bc26..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings
deleted file mode 100644
index 294472bc26..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000030
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings
deleted file mode 100644
index c885e37d18..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings
deleted file mode 100644
index be630d4c6d..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000ff
diff --git a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings
deleted file mode 100644
index c885e37d18..0000000000
--- a/tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings
+++ /dev/null
@@ -1 +0,0 @@
-00000000,00000000,00000000,00000000,00000000,00000000,00000000,000000c0