Since we don't pack symlinks we cannot have recursive loops in them. Since we need one directory to be in tests/vircaps2xmldata/linux-caches/, instead of creating a symlink, just move the files in that directory and adjust tests. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- Pushed under the build-breaker rule tests/vircaps2xmldata/linux-caches/system | 1 - .../linux-caches/{ => system}/cpu/cpu0/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/level | 0 .../{ => system}/cpu/cpu0/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/level | 0 .../{ => system}/cpu/cpu0/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/level | 0 .../{ => system}/cpu/cpu0/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/level | 0 .../{ => system}/cpu/cpu0/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu0/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu0/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings | 0 .../{ => system}/cpu/cpu0/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/level | 0 .../{ => system}/cpu/cpu1/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/level | 0 .../{ => system}/cpu/cpu1/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/level | 0 .../{ => system}/cpu/cpu1/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/level | 0 .../{ => system}/cpu/cpu1/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu1/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu1/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings | 0 .../{ => system}/cpu/cpu1/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/level | 0 .../{ => system}/cpu/cpu2/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/level | 0 .../{ => system}/cpu/cpu2/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/level | 0 .../{ => system}/cpu/cpu2/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/level | 0 .../{ => system}/cpu/cpu2/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu2/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu2/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings | 0 .../{ => system}/cpu/cpu2/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/level | 0 .../{ => system}/cpu/cpu3/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/level | 0 .../{ => system}/cpu/cpu3/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/level | 0 .../{ => system}/cpu/cpu3/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/level | 0 .../{ => system}/cpu/cpu3/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu3/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu3/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings | 0 .../{ => system}/cpu/cpu3/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/level | 0 .../{ => system}/cpu/cpu4/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/level | 0 .../{ => system}/cpu/cpu4/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/level | 0 .../{ => system}/cpu/cpu4/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/level | 0 .../{ => system}/cpu/cpu4/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu4/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu4/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings | 0 .../{ => system}/cpu/cpu4/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/level | 0 .../{ => system}/cpu/cpu5/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/level | 0 .../{ => system}/cpu/cpu5/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/level | 0 .../{ => system}/cpu/cpu5/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/level | 0 .../{ => system}/cpu/cpu5/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu5/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu5/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings | 0 .../{ => system}/cpu/cpu5/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/level | 0 .../{ => system}/cpu/cpu6/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/level | 0 .../{ => system}/cpu/cpu6/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/level | 0 .../{ => system}/cpu/cpu6/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/level | 0 .../{ => system}/cpu/cpu6/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu6/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu6/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings | 0 .../{ => system}/cpu/cpu6/topology/thread_siblings_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/level | 0 .../{ => system}/cpu/cpu7/cache/index0/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index0/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/level | 0 .../{ => system}/cpu/cpu7/cache/index1/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index1/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/level | 0 .../{ => system}/cpu/cpu7/cache/index2/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index2/type | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/id | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/level | 0 .../{ => system}/cpu/cpu7/cache/index3/shared_cpu_list | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/size | 0 .../linux-caches/{ => system}/cpu/cpu7/cache/index3/type | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_id | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list | 0 .../{ => system}/cpu/cpu7/topology/physical_package_id | 0 .../linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings | 0 .../{ => system}/cpu/cpu7/topology/thread_siblings_list | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online | 0 tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/online | 0 tests/vircaps2xmldata/linux-caches/{ => system}/node/possible | 0 tests/vircaps2xmltest.c | 7 ++++--- 257 files changed, 4 insertions(+), 4 deletions(-) delete mode 120000 tests/vircaps2xmldata/linux-caches/system rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/level (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/size (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/type (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/physical_package_id (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/online (100%) rename tests/vircaps2xmldata/linux-caches/{ => system}/node/possible (100%) diff --git a/tests/vircaps2xmldata/linux-caches/system b/tests/vircaps2xmldata/linux-caches/system deleted file mode 120000 index 945c9b46d684..000000000000 --- a/tests/vircaps2xmldata/linux-caches/system +++ /dev/null @@ -1 +0,0 @@ -. \ No newline at end of file diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list diff --git a/tests/vircaps2xmldata/linux-caches/cpu/kernel_max b/tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/kernel_max rename to tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max diff --git a/tests/vircaps2xmldata/linux-caches/cpu/online b/tests/vircaps2xmldata/linux-caches/system/cpu/online similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/online rename to tests/vircaps2xmldata/linux-caches/system/cpu/online diff --git a/tests/vircaps2xmldata/linux-caches/cpu/present b/tests/vircaps2xmldata/linux-caches/system/cpu/present similarity index 100% rename from tests/vircaps2xmldata/linux-caches/cpu/present rename to tests/vircaps2xmldata/linux-caches/system/cpu/present diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu0 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu0 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu1 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu1 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu2 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu2 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu3 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu3 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu4 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu4 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu5 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu5 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu6 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu6 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu7 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu7 rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7 diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpulist b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/cpulist rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/meminfo b/tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/node0/meminfo rename to tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo diff --git a/tests/vircaps2xmldata/linux-caches/node/online b/tests/vircaps2xmldata/linux-caches/system/node/online similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/online rename to tests/vircaps2xmldata/linux-caches/system/node/online diff --git a/tests/vircaps2xmldata/linux-caches/node/possible b/tests/vircaps2xmldata/linux-caches/system/node/possible similarity index 100% rename from tests/vircaps2xmldata/linux-caches/node/possible rename to tests/vircaps2xmldata/linux-caches/system/node/possible diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index 12c43f42c6b9..ede546825edc 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -111,12 +111,13 @@ mymain(void) ret = -1; \ } while (0) -#define DO_TEST(filename, arch) DO_TEST_FULL(filename, arch, true, true, false) - DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false, false); DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false, false); - DO_TEST("caches", VIR_ARCH_X86_64); + /* 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("resctrl", VIR_ARCH_X86_64, true, true, true); DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true); -- 2.15.0