If all we achieve is reducing the depth by one for a single test case, the additional complexity (not to mention breaking the principle of least surprise) is not worth it: let's use simpler, more predictable code instead. This basically reverts fec6e4c48c9c (with a few adjustments). Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../{ => system}/cpu/cpu0/topology/core_id | 0 .../cpu/cpu0/topology/core_siblings | 0 .../cpu/cpu0/topology/core_siblings_list | 0 .../cpu/cpu0/topology/physical_package_id | 0 .../cpu/cpu0/topology/thread_siblings | 0 .../cpu/cpu0/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu1/topology/core_id | 0 .../cpu/cpu1/topology/core_siblings | 0 .../cpu/cpu1/topology/core_siblings_list | 0 .../cpu/cpu1/topology/physical_package_id | 0 .../cpu/cpu1/topology/thread_siblings | 0 .../cpu/cpu1/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu10/topology/core_id | 0 .../cpu/cpu10/topology/core_siblings | 0 .../cpu/cpu10/topology/core_siblings_list | 0 .../cpu/cpu10/topology/physical_package_id | 0 .../cpu/cpu10/topology/thread_siblings | 0 .../cpu/cpu10/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu11/topology/core_id | 0 .../cpu/cpu11/topology/core_siblings | 0 .../cpu/cpu11/topology/core_siblings_list | 0 .../cpu/cpu11/topology/physical_package_id | 0 .../cpu/cpu11/topology/thread_siblings | 0 .../cpu/cpu11/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu12/topology/core_id | 0 .../cpu/cpu12/topology/core_siblings | 0 .../cpu/cpu12/topology/core_siblings_list | 0 .../cpu/cpu12/topology/physical_package_id | 0 .../cpu/cpu12/topology/thread_siblings | 0 .../cpu/cpu12/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu13/topology/core_id | 0 .../cpu/cpu13/topology/core_siblings | 0 .../cpu/cpu13/topology/core_siblings_list | 0 .../cpu/cpu13/topology/physical_package_id | 0 .../cpu/cpu13/topology/thread_siblings | 0 .../cpu/cpu13/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu14/topology/core_id | 0 .../cpu/cpu14/topology/core_siblings | 0 .../cpu/cpu14/topology/core_siblings_list | 0 .../cpu/cpu14/topology/physical_package_id | 0 .../cpu/cpu14/topology/thread_siblings | 0 .../cpu/cpu14/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu15/topology/core_id | 0 .../cpu/cpu15/topology/core_siblings | 0 .../cpu/cpu15/topology/core_siblings_list | 0 .../cpu/cpu15/topology/physical_package_id | 0 .../cpu/cpu15/topology/thread_siblings | 0 .../cpu/cpu15/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu2/topology/core_id | 0 .../cpu/cpu2/topology/core_siblings | 0 .../cpu/cpu2/topology/core_siblings_list | 0 .../cpu/cpu2/topology/physical_package_id | 0 .../cpu/cpu2/topology/thread_siblings | 0 .../cpu/cpu2/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu3/topology/core_id | 0 .../cpu/cpu3/topology/core_siblings | 0 .../cpu/cpu3/topology/core_siblings_list | 0 .../cpu/cpu3/topology/physical_package_id | 0 .../cpu/cpu3/topology/thread_siblings | 0 .../cpu/cpu3/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu4/topology/core_id | 0 .../cpu/cpu4/topology/core_siblings | 0 .../cpu/cpu4/topology/core_siblings_list | 0 .../cpu/cpu4/topology/physical_package_id | 0 .../cpu/cpu4/topology/thread_siblings | 0 .../cpu/cpu4/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu5/topology/core_id | 0 .../cpu/cpu5/topology/core_siblings | 0 .../cpu/cpu5/topology/core_siblings_list | 0 .../cpu/cpu5/topology/physical_package_id | 0 .../cpu/cpu5/topology/thread_siblings | 0 .../cpu/cpu5/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu6/topology/core_id | 0 .../cpu/cpu6/topology/core_siblings | 0 .../cpu/cpu6/topology/core_siblings_list | 0 .../cpu/cpu6/topology/physical_package_id | 0 .../cpu/cpu6/topology/thread_siblings | 0 .../cpu/cpu6/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu7/topology/core_id | 0 .../cpu/cpu7/topology/core_siblings | 0 .../cpu/cpu7/topology/core_siblings_list | 0 .../cpu/cpu7/topology/physical_package_id | 0 .../cpu/cpu7/topology/thread_siblings | 0 .../cpu/cpu7/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu8/topology/core_id | 0 .../cpu/cpu8/topology/core_siblings | 0 .../cpu/cpu8/topology/core_siblings_list | 0 .../cpu/cpu8/topology/physical_package_id | 0 .../cpu/cpu8/topology/thread_siblings | 0 .../cpu/cpu8/topology/thread_siblings_list | 0 .../{ => system}/cpu/cpu9/topology/core_id | 0 .../cpu/cpu9/topology/core_siblings | 0 .../cpu/cpu9/topology/core_siblings_list | 0 .../cpu/cpu9/topology/physical_package_id | 0 .../cpu/cpu9/topology/thread_siblings | 0 .../cpu/cpu9/topology/thread_siblings_list | 0 .../linux-basic/{ => system}/cpu/online | 0 .../linux-basic/{ => system}/cpu/present | 0 .../linux-basic/{ => system}/node/node0/cpu0 | 0 .../linux-basic/{ => system}/node/node0/cpu1 | 0 .../linux-basic/{ => system}/node/node0/cpu2 | 0 .../linux-basic/{ => system}/node/node0/cpu3 | 0 .../{ => system}/node/node0/cpulist | 0 .../linux-basic/{ => system}/node/node1/cpu4 | 0 .../linux-basic/{ => system}/node/node1/cpu5 | 0 .../linux-basic/{ => system}/node/node1/cpu6 | 0 .../linux-basic/{ => system}/node/node1/cpu7 | 0 .../{ => system}/node/node1/cpulist | 0 .../linux-basic/{ => system}/node/node2/cpu10 | 0 .../linux-basic/{ => system}/node/node2/cpu11 | 0 .../linux-basic/{ => system}/node/node2/cpu8 | 0 .../linux-basic/{ => system}/node/node2/cpu9 | 0 .../{ => system}/node/node2/cpulist | 0 .../linux-basic/{ => system}/node/node3/cpu12 | 0 .../linux-basic/{ => system}/node/node3/cpu13 | 0 .../linux-basic/{ => system}/node/node3/cpu14 | 0 .../linux-basic/{ => system}/node/node3/cpu15 | 0 .../{ => system}/node/node3/cpulist | 0 .../linux-basic/{ => system}/node/online | 0 .../linux-basic/{ => system}/node/possible | 0 tests/vircaps2xmltest.c | 37 +++++++------------ 121 files changed, 14 insertions(+), 23 deletions(-) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu0/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu1/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu10/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu11/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu12/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu13/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu14/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu15/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu2/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu3/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu4/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu5/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu6/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu7/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu8/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/cpu9/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/online (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/cpu/present (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu0 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu1 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu2 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpu3 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node0/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu4 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu5 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu6 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpu7 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node1/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu10 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu11 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu8 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpu9 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node2/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu12 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu13 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu14 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpu15 (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/node3/cpulist (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/online (100%) rename tests/vircaps2xmldata/linux-basic/{ => system}/node/possible (100%) diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_package_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_package_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/online b/tests/vircaps2xmldata/linux-basic/system/cpu/online similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/online rename to tests/vircaps2xmldata/linux-basic/system/cpu/online diff --git a/tests/vircaps2xmldata/linux-basic/cpu/present b/tests/vircaps2xmldata/linux-basic/system/cpu/present similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/present rename to tests/vircaps2xmldata/linux-basic/system/cpu/present diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu0 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu0 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu1 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu1 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu2 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu2 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu2 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpu3 b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpu3 rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpu3 diff --git a/tests/vircaps2xmldata/linux-basic/node/node0/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node0/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node0/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node0/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu4 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu4 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu4 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu5 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu5 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu5 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu6 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu6 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu6 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpu7 b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpu7 rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpu7 diff --git a/tests/vircaps2xmldata/linux-basic/node/node1/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node1/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node1/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node1/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu10 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu10 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu10 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu11 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu11 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu11 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu8 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu8 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu8 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpu9 b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpu9 rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpu9 diff --git a/tests/vircaps2xmldata/linux-basic/node/node2/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node2/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node2/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node2/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu12 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu12 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu12 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu13 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu13 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu13 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu14 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu14 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu14 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpu15 b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpu15 rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpu15 diff --git a/tests/vircaps2xmldata/linux-basic/node/node3/cpulist b/tests/vircaps2xmldata/linux-basic/system/node/node3/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/node3/cpulist rename to tests/vircaps2xmldata/linux-basic/system/node/node3/cpulist diff --git a/tests/vircaps2xmldata/linux-basic/node/online b/tests/vircaps2xmldata/linux-basic/system/node/online similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/online rename to tests/vircaps2xmldata/linux-basic/system/node/online diff --git a/tests/vircaps2xmldata/linux-basic/node/possible b/tests/vircaps2xmldata/linux-basic/system/node/possible similarity index 100% rename from tests/vircaps2xmldata/linux-basic/node/possible rename to tests/vircaps2xmldata/linux-basic/system/node/possible diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index ede546825e..1fb8861d8a 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -35,7 +35,6 @@ struct virCapabilitiesData { virArch arch; bool offlineMigrate; bool liveMigrate; - bool resctrl; /* Whether both resctrl and system sysfs are used */ }; static int @@ -46,24 +45,19 @@ test_virCapabilities(const void *opaque) virCapsPtr caps = NULL; char *capsXML = NULL; char *path = NULL; - char *dir = NULL; + char *system = NULL; char *resctrl = NULL; int ret = -1; - /* - * We want to keep our directory structure clean, so if there's both resctrl - * and system used, we need to use slightly different path; a subdir. - */ - if (virAsprintf(&dir, "%s/vircaps2xmldata/linux-%s%s", - abs_srcdir, data->filename, - data->resctrl ? "/system" : "") < 0) + if (virAsprintf(&system, "%s/vircaps2xmldata/linux-%s/system", + abs_srcdir, data->filename) < 0) goto cleanup; if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, data->filename) < 0) goto cleanup; - virFileWrapperAddPrefix("/sys/devices/system", dir); + virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); @@ -89,7 +83,7 @@ test_virCapabilities(const void *opaque) ret = 0; cleanup: - VIR_FREE(dir); + VIR_FREE(system); VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); @@ -102,27 +96,24 @@ mymain(void) { int ret = 0; -#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate, resctrl) \ +#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate) \ do { \ struct virCapabilitiesData data = {filename, arch, \ offlineMigrate, \ - liveMigrate, resctrl}; \ + liveMigrate}; \ if (virTestRun(filename, test_virCapabilities, &data) < 0) \ ret = -1; \ } while (0) - DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false, false); - DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false, false); + DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false); + DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false); - /* We say there is 'resctrl' even though there is none. This is special - * case because we want to use this test data for a negative tests for - * resctrl. */ - DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true); - DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true); - DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true, true); + DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true); + DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true); return ret; } -- 2.17.1