9:36 a.m.
So during a discussion [1] with Erik, I got an idea. And this is
basically it. Reading and using kernel-interface-like files in an easy
fashion and being able to easily mock them were two goals that, in my
not so humble opinion, I reached.
The previous version [2] is actually nor related to this one that much
as this one is a complete rewrite except the trivial fixes and test
additions from the next one.
[1] https://www.redhat.com/archives/libvir-list/2017-April/msg00040.html
[2] https://www.redhat.com/archives/libvir-list/2017-March/msg01592.html
Martin Kletzander (12):
conf: Fix possible memleak in capabilities
util: Fix virDirRead() description
util: Add virStringTrimOptionalNewline
tests: Add virfilemock -- the new super mock
util: Remove virsysfs and instead enhance virFileReadValue* functions
tests: Test vircaps2xmldata XMLs in virschematest
tests: Add missing cache data for vircaps2xmltest
Add RNG schema for host cache information in capabilities
Add host cache information into capabilities
Init host cache info in drivers
tests: Add support for more complicated hierarchies in vircaps2xmltest
tests: Add resctrl test for vircaps2xmltest
cfg.mk | 2 +-
docs/schemas/capability.rng | 34 +++
src/Makefile.am | 2 -
src/conf/capabilities.c | 207 ++++++++++++++-
src/conf/capabilities.h | 29 +++
src/libvirt_private.syms | 17 +-
src/lxc/lxc_conf.c | 3 +
src/openvz/openvz_conf.c | 3 +
src/phyp/phyp_driver.c | 3 +
src/qemu/qemu_capabilities.c | 3 +
src/uml/uml_conf.c | 3 +
src/util/virfile.c | 222 ++++++++++++----
src/util/virfile.h | 14 +-
src/util/virhostcpu.c | 47 ++--
src/util/virstring.h | 8 +
src/util/virsysfs.c | 229 -----------------
src/util/virsysfs.h | 70 -----
src/vbox/vbox_common.c | 3 +
src/vmware/vmware_conf.c | 3 +
src/vz/vz_driver.c | 2 +
tests/Makefile.am | 5 +-
.../linux-caches/cpu/cpu0/cache/index0/id | 1 +
.../cpu/cpu0/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu0/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu0/cache/index1/id | 1 +
.../cpu/cpu0/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu0/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu0/cache/index2/id | 1 +
.../cpu/cpu0/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu0/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu0/cache/index3/id | 1 +
.../linux-caches/cpu/cpu1/cache/index0/id | 1 +
.../cpu/cpu1/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu1/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu1/cache/index1/id | 1 +
.../cpu/cpu1/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu1/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu1/cache/index2/id | 1 +
.../cpu/cpu1/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu1/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu1/cache/index3/id | 1 +
.../linux-caches/cpu/cpu2/cache/index0/id | 1 +
.../cpu/cpu2/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu2/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu2/cache/index1/id | 1 +
.../cpu/cpu2/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu2/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu2/cache/index2/id | 1 +
.../cpu/cpu2/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu2/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu2/cache/index3/id | 1 +
.../linux-caches/cpu/cpu3/cache/index0/id | 1 +
.../cpu/cpu3/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu3/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu3/cache/index1/id | 1 +
.../cpu/cpu3/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu3/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu3/cache/index2/id | 1 +
.../cpu/cpu3/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu3/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu3/cache/index3/id | 1 +
.../linux-caches/cpu/cpu4/cache/index0/id | 1 +
.../cpu/cpu4/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu4/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu4/cache/index1/id | 1 +
.../cpu/cpu4/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu4/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu4/cache/index2/id | 1 +
.../cpu/cpu4/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu4/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu4/cache/index3/id | 1 +
.../linux-caches/cpu/cpu5/cache/index0/id | 1 +
.../cpu/cpu5/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu5/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu5/cache/index1/id | 1 +
.../cpu/cpu5/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu5/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu5/cache/index2/id | 1 +
.../cpu/cpu5/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu5/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu5/cache/index3/id | 1 +
.../linux-caches/cpu/cpu6/cache/index0/id | 1 +
.../cpu/cpu6/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu6/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu6/cache/index1/id | 1 +
.../cpu/cpu6/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu6/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu6/cache/index2/id | 1 +
.../cpu/cpu6/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu6/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu6/cache/index3/id | 1 +
.../linux-caches/cpu/cpu7/cache/index0/id | 1 +
.../cpu/cpu7/cache/index0/shared_cpu_list | 2 +-
.../cpu/cpu7/cache/index0/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu7/cache/index1/id | 1 +
.../cpu/cpu7/cache/index1/shared_cpu_list | 2 +-
.../cpu/cpu7/cache/index1/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu7/cache/index2/id | 1 +
.../cpu/cpu7/cache/index2/shared_cpu_list | 2 +-
.../cpu/cpu7/cache/index2/shared_cpu_map | 2 +-
.../linux-caches/cpu/cpu7/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 +
.../linux-resctrl/resctrl/info/L3/cbm_mask | 1 +
.../linux-resctrl/resctrl/info/L3/min_cbm_bits | 1 +
.../linux-resctrl/resctrl/info/L3/num_closids | 1 +
.../linux-resctrl/resctrl/manualres/cpus | 1 +
.../linux-resctrl/resctrl/manualres/schemata | 1 +
.../linux-resctrl/resctrl/manualres/tasks | 0
.../vircaps2xmldata/linux-resctrl/resctrl/schemata | 1 +
tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0
.../linux-resctrl/system/cpu/cpu0/cache/index0/id | 1 +
.../system/cpu/cpu0/cache/index0/level | 1 +
.../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index0/size | 1 +
.../system/cpu/cpu0/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index1/id | 1 +
.../system/cpu/cpu0/cache/index1/level | 1 +
.../system/cpu/cpu0/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index1/size | 1 +
.../system/cpu/cpu0/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index2/id | 1 +
.../system/cpu/cpu0/cache/index2/level | 1 +
.../system/cpu/cpu0/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index2/size | 1 +
.../system/cpu/cpu0/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index3/id | 1 +
.../system/cpu/cpu0/cache/index3/level | 1 +
.../system/cpu/cpu0/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index3/size | 1 +
.../system/cpu/cpu0/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu0/online | 1 +
.../linux-resctrl/system/cpu/cpu0/topology/core_id | 1 +
.../system/cpu/cpu0/topology/core_siblings | 1 +
.../system/cpu/cpu0/topology/core_siblings_list | 1 +
.../system/cpu/cpu0/topology/physical_package_id | 1 +
.../system/cpu/cpu0/topology/thread_siblings | 1 +
.../system/cpu/cpu0/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index0/id | 1 +
.../system/cpu/cpu1/cache/index0/level | 1 +
.../system/cpu/cpu1/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index0/size | 1 +
.../system/cpu/cpu1/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index1/id | 1 +
.../system/cpu/cpu1/cache/index1/level | 1 +
.../system/cpu/cpu1/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index1/size | 1 +
.../system/cpu/cpu1/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index2/id | 1 +
.../system/cpu/cpu1/cache/index2/level | 1 +
.../system/cpu/cpu1/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index2/size | 1 +
.../system/cpu/cpu1/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index3/id | 1 +
.../system/cpu/cpu1/cache/index3/level | 1 +
.../system/cpu/cpu1/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index3/size | 1 +
.../system/cpu/cpu1/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu1/online | 1 +
.../linux-resctrl/system/cpu/cpu1/topology/core_id | 1 +
.../system/cpu/cpu1/topology/core_siblings | 1 +
.../system/cpu/cpu1/topology/core_siblings_list | 1 +
.../system/cpu/cpu1/topology/physical_package_id | 1 +
.../system/cpu/cpu1/topology/thread_siblings | 1 +
.../system/cpu/cpu1/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index0/id | 1 +
.../system/cpu/cpu10/cache/index0/level | 1 +
.../system/cpu/cpu10/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index0/size | 1 +
.../system/cpu/cpu10/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index1/id | 1 +
.../system/cpu/cpu10/cache/index1/level | 1 +
.../system/cpu/cpu10/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index1/size | 1 +
.../system/cpu/cpu10/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index2/id | 1 +
.../system/cpu/cpu10/cache/index2/level | 1 +
.../system/cpu/cpu10/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index2/size | 1 +
.../system/cpu/cpu10/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index3/id | 1 +
.../system/cpu/cpu10/cache/index3/level | 1 +
.../system/cpu/cpu10/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index3/size | 1 +
.../system/cpu/cpu10/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu10/online | 1 +
.../system/cpu/cpu10/topology/core_id | 1 +
.../system/cpu/cpu10/topology/core_siblings | 1 +
.../system/cpu/cpu10/topology/core_siblings_list | 1 +
.../system/cpu/cpu10/topology/physical_package_id | 1 +
.../system/cpu/cpu10/topology/thread_siblings | 1 +
.../system/cpu/cpu10/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index0/id | 1 +
.../system/cpu/cpu11/cache/index0/level | 1 +
.../system/cpu/cpu11/cache/index0/shared_cpu_list} | 0
.../system/cpu/cpu11/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index0/size | 1 +
.../system/cpu/cpu11/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index1/id | 1 +
.../system/cpu/cpu11/cache/index1/level | 1 +
.../system/cpu/cpu11/cache/index1/shared_cpu_list} | 0
.../system/cpu/cpu11/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index1/size | 1 +
.../system/cpu/cpu11/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index2/id | 1 +
.../system/cpu/cpu11/cache/index2/level | 1 +
.../system/cpu/cpu11/cache/index2/shared_cpu_list} | 0
.../system/cpu/cpu11/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index2/size | 1 +
.../system/cpu/cpu11/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index3/id | 1 +
.../system/cpu/cpu11/cache/index3/level | 1 +
.../system/cpu/cpu11/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu11/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index3/size | 1 +
.../system/cpu/cpu11/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu11/online | 1 +
.../system/cpu/cpu11/topology/core_id | 1 +
.../system/cpu/cpu11/topology/core_siblings | 1 +
.../system/cpu/cpu11/topology/core_siblings_list | 1 +
.../system/cpu/cpu11/topology/physical_package_id | 1 +
.../system/cpu/cpu11/topology/thread_siblings | 1 +
.../cpu/cpu11/topology/thread_siblings_list} | 0
.../linux-resctrl/system/cpu/cpu2/cache/index0/id | 1 +
.../system/cpu/cpu2/cache/index0/level | 1 +
.../system/cpu/cpu2/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index0/size | 1 +
.../system/cpu/cpu2/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index1/id | 1 +
.../system/cpu/cpu2/cache/index1/level | 1 +
.../system/cpu/cpu2/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index1/size | 1 +
.../system/cpu/cpu2/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index2/id | 1 +
.../system/cpu/cpu2/cache/index2/level | 1 +
.../system/cpu/cpu2/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index2/size | 1 +
.../system/cpu/cpu2/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index3/id | 1 +
.../system/cpu/cpu2/cache/index3/level | 1 +
.../system/cpu/cpu2/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index3/size | 1 +
.../system/cpu/cpu2/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu2/online | 1 +
.../linux-resctrl/system/cpu/cpu2/topology/core_id | 1 +
.../system/cpu/cpu2/topology/core_siblings | 1 +
.../system/cpu/cpu2/topology/core_siblings_list | 1 +
.../system/cpu/cpu2/topology/physical_package_id | 1 +
.../system/cpu/cpu2/topology/thread_siblings | 1 +
.../system/cpu/cpu2/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index0/id | 1 +
.../system/cpu/cpu3/cache/index0/level | 1 +
.../system/cpu/cpu3/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index0/size | 1 +
.../system/cpu/cpu3/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index1/id | 1 +
.../system/cpu/cpu3/cache/index1/level | 1 +
.../system/cpu/cpu3/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index1/size | 1 +
.../system/cpu/cpu3/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index2/id | 1 +
.../system/cpu/cpu3/cache/index2/level | 1 +
.../system/cpu/cpu3/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index2/size | 1 +
.../system/cpu/cpu3/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index3/id | 1 +
.../system/cpu/cpu3/cache/index3/level | 1 +
.../system/cpu/cpu3/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index3/size | 1 +
.../system/cpu/cpu3/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu3/online | 1 +
.../linux-resctrl/system/cpu/cpu3/topology/core_id | 1 +
.../system/cpu/cpu3/topology/core_siblings | 1 +
.../system/cpu/cpu3/topology/core_siblings_list | 1 +
.../system/cpu/cpu3/topology/physical_package_id | 1 +
.../system/cpu/cpu3/topology/thread_siblings | 1 +
.../system/cpu/cpu3/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index0/id | 1 +
.../system/cpu/cpu4/cache/index0/level | 1 +
.../system/cpu/cpu4/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index0/size | 1 +
.../system/cpu/cpu4/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index1/id | 1 +
.../system/cpu/cpu4/cache/index1/level | 1 +
.../system/cpu/cpu4/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index1/size | 1 +
.../system/cpu/cpu4/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index2/id | 1 +
.../system/cpu/cpu4/cache/index2/level | 1 +
.../system/cpu/cpu4/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index2/size | 1 +
.../system/cpu/cpu4/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index3/id | 1 +
.../system/cpu/cpu4/cache/index3/level | 1 +
.../system/cpu/cpu4/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index3/size | 1 +
.../system/cpu/cpu4/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu4/online | 1 +
.../linux-resctrl/system/cpu/cpu4/topology/core_id | 1 +
.../system/cpu/cpu4/topology/core_siblings | 1 +
.../system/cpu/cpu4/topology/core_siblings_list | 1 +
.../system/cpu/cpu4/topology/physical_package_id | 1 +
.../system/cpu/cpu4/topology/thread_siblings | 1 +
.../system/cpu/cpu4/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index0/id | 1 +
.../system/cpu/cpu5/cache/index0/level | 1 +
.../system/cpu/cpu5/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index0/size | 1 +
.../system/cpu/cpu5/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index1/id | 1 +
.../system/cpu/cpu5/cache/index1/level | 1 +
.../system/cpu/cpu5/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index1/size | 1 +
.../system/cpu/cpu5/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index2/id | 1 +
.../system/cpu/cpu5/cache/index2/level | 1 +
.../system/cpu/cpu5/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index2/size | 1 +
.../system/cpu/cpu5/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index3/id | 1 +
.../system/cpu/cpu5/cache/index3/level | 1 +
.../system/cpu/cpu5/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index3/size | 1 +
.../system/cpu/cpu5/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu5/online | 1 +
.../linux-resctrl/system/cpu/cpu5/topology/core_id | 1 +
.../system/cpu/cpu5/topology/core_siblings | 1 +
.../system/cpu/cpu5/topology/core_siblings_list | 1 +
.../system/cpu/cpu5/topology/physical_package_id | 1 +
.../system/cpu/cpu5/topology/thread_siblings | 1 +
.../system/cpu/cpu5/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index0/id | 1 +
.../system/cpu/cpu6/cache/index0/level | 1 +
.../system/cpu/cpu6/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index0/size | 1 +
.../system/cpu/cpu6/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index1/id | 1 +
.../system/cpu/cpu6/cache/index1/level | 1 +
.../system/cpu/cpu6/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index1/size | 1 +
.../system/cpu/cpu6/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index2/id | 1 +
.../system/cpu/cpu6/cache/index2/level | 1 +
.../system/cpu/cpu6/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index2/size | 1 +
.../system/cpu/cpu6/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index3/id | 1 +
.../system/cpu/cpu6/cache/index3/level | 1 +
.../system/cpu/cpu6/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index3/size | 1 +
.../system/cpu/cpu6/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu6/online | 1 +
.../linux-resctrl/system/cpu/cpu6/topology/core_id | 1 +
.../system/cpu/cpu6/topology/core_siblings | 1 +
.../system/cpu/cpu6/topology/core_siblings_list | 1 +
.../system/cpu/cpu6/topology/physical_package_id | 1 +
.../system/cpu/cpu6/topology/thread_siblings | 1 +
.../system/cpu/cpu6/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index0/id | 1 +
.../system/cpu/cpu7/cache/index0/level | 1 +
.../system/cpu/cpu7/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index0/size | 1 +
.../system/cpu/cpu7/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index1/id | 1 +
.../system/cpu/cpu7/cache/index1/level | 1 +
.../system/cpu/cpu7/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index1/size | 1 +
.../system/cpu/cpu7/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index2/id | 1 +
.../system/cpu/cpu7/cache/index2/level | 1 +
.../system/cpu/cpu7/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index2/size | 1 +
.../system/cpu/cpu7/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index3/id | 1 +
.../system/cpu/cpu7/cache/index3/level | 1 +
.../system/cpu/cpu7/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index3/size | 1 +
.../system/cpu/cpu7/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu7/online | 1 +
.../linux-resctrl/system/cpu/cpu7/topology/core_id | 1 +
.../system/cpu/cpu7/topology/core_siblings | 1 +
.../system/cpu/cpu7/topology/core_siblings_list | 1 +
.../system/cpu/cpu7/topology/physical_package_id | 1 +
.../system/cpu/cpu7/topology/thread_siblings | 1 +
.../system/cpu/cpu7/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index0/id | 1 +
.../system/cpu/cpu8/cache/index0/level | 1 +
.../system/cpu/cpu8/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index0/size | 1 +
.../system/cpu/cpu8/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index1/id | 1 +
.../system/cpu/cpu8/cache/index1/level | 1 +
.../system/cpu/cpu8/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index1/size | 1 +
.../system/cpu/cpu8/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index2/id | 1 +
.../system/cpu/cpu8/cache/index2/level | 1 +
.../system/cpu/cpu8/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index2/size | 1 +
.../system/cpu/cpu8/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index3/id | 1 +
.../system/cpu/cpu8/cache/index3/level | 1 +
.../system/cpu/cpu8/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index3/size | 1 +
.../system/cpu/cpu8/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu8/online | 1 +
.../linux-resctrl/system/cpu/cpu8/topology/core_id | 1 +
.../system/cpu/cpu8/topology/core_siblings | 1 +
.../system/cpu/cpu8/topology/core_siblings_list | 1 +
.../system/cpu/cpu8/topology/physical_package_id | 1 +
.../system/cpu/cpu8/topology/thread_siblings | 1 +
.../system/cpu/cpu8/topology/thread_siblings_list | 1 +
.../system/cpu/cpu9/cache/index0/id} | 0
.../system/cpu/cpu9/cache/index0/level | 1 +
.../system/cpu/cpu9/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index0/size | 1 +
.../system/cpu/cpu9/cache/index0/type | 1 +
.../system/cpu/cpu9/cache/index1/id} | 0
.../system/cpu/cpu9/cache/index1/level | 1 +
.../system/cpu/cpu9/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index1/size | 1 +
.../system/cpu/cpu9/cache/index1/type | 1 +
.../system/cpu/cpu9/cache/index2/id} | 0
.../system/cpu/cpu9/cache/index2/level | 1 +
.../system/cpu/cpu9/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index2/size | 1 +
.../system/cpu/cpu9/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu9/cache/index3/id | 1 +
.../system/cpu/cpu9/cache/index3/level | 1 +
.../system/cpu/cpu9/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index3/size | 1 +
.../system/cpu/cpu9/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu9/online | 1 +
.../linux-resctrl/system/cpu/cpu9/topology/core_id | 1 +
.../system/cpu/cpu9/topology/core_siblings | 1 +
.../system/cpu/cpu9/topology/core_siblings_list | 1 +
.../system/cpu/cpu9/topology/physical_package_id | 1 +
.../system/cpu/cpu9/topology/thread_siblings | 1 +
.../system/cpu/cpu9/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/online | 1 +
.../linux-resctrl/system/cpu/present | 1 +
.../linux-resctrl/system/node/node0/cpu0 | 1 +
.../linux-resctrl/system/node/node0/cpu1 | 1 +
.../linux-resctrl/system/node/node0/cpu2 | 1 +
.../linux-resctrl/system/node/node0/cpu3 | 1 +
.../linux-resctrl/system/node/node0/cpu4 | 1 +
.../linux-resctrl/system/node/node0/cpu5 | 1 +
.../linux-resctrl/system/node/node0/cpulist | 1 +
.../linux-resctrl/system/node/node0/cpumap | 1 +
.../linux-resctrl/system/node/node0/distance | 1 +
.../hugepages/hugepages-1048576kB/free_hugepages | 1 +
.../hugepages/hugepages-1048576kB/nr_hugepages | 1 +
.../hugepages-1048576kB/surplus_hugepages | 1 +
.../hugepages/hugepages-2048kB/free_hugepages | 1 +
.../node0/hugepages/hugepages-2048kB/nr_hugepages | 1 +
.../hugepages/hugepages-2048kB/surplus_hugepages | 1 +
.../linux-resctrl/system/node/node1/cpu10 | 1 +
.../linux-resctrl/system/node/node1/cpu11 | 1 +
.../linux-resctrl/system/node/node1/cpu6 | 1 +
.../linux-resctrl/system/node/node1/cpu7 | 1 +
.../linux-resctrl/system/node/node1/cpu8 | 1 +
.../linux-resctrl/system/node/node1/cpu9 | 1 +
.../linux-resctrl/system/node/node1/cpulist | 1 +
.../linux-resctrl/system/node/node1/cpumap | 1 +
.../linux-resctrl/system/node/node1/distance | 1 +
.../hugepages/hugepages-1048576kB/free_hugepages | 1 +
.../hugepages/hugepages-1048576kB/nr_hugepages | 1 +
.../hugepages-1048576kB/surplus_hugepages | 1 +
.../hugepages/hugepages-2048kB/free_hugepages | 1 +
.../node1/hugepages/hugepages-2048kB/nr_hugepages | 1 +
.../hugepages/hugepages-2048kB/surplus_hugepages | 1 +
.../linux-resctrl/system/node/online | 1 +
tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 3 +
tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 49 ++++
tests/vircaps2xmltest.c | 31 ++-
tests/virfilemock.c | 281 +++++++++++++++++++++
src/util/virsysfspriv.h => tests/virfilemock.h | 19 +-
tests/virhostcputest.c | 8 +-
tests/virnumamock.c | 15 +-
tests/virschematest.c | 3 +-
523 files changed, 1386 insertions(+), 465 deletions(-)
delete mode 100644 src/util/virsysfs.c
delete mode 100644 src/util/virsysfs.h
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/tasks
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list} (100%)
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu9/cache/index0/id} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu9/cache/index1/id} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type
copy tests/vircaps2xmldata/{linux-caches/cpu/cpu0/cache/index0/shared_cpu_map =>
linux-resctrl/system/cpu/cpu9/cache/index2/id} (100%)
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/present
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/online
create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
create mode 100644 tests/virfilemock.c
rename src/util/virsysfspriv.h => tests/virfilemock.h (70%)
--
2.12.2
9:36 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
If formatting NUMA topology fails, the function returns immediatelly,
but the buffer structure allocated on the stack references lot of
heap-allocated memory and that would get lost in such case.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/conf/capabilities.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 08907aced1b9..be95c50cfb67 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
if (caps->host.nnumaCell &&
virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell,
caps->host.numaCell) < 0)
- return NULL;
+ goto error;
for (i = 0; i < caps->host.nsecModels; i++) {
virBufferAddLit(&buf, "<secmodel>\n");
@@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
return NULL;
return virBufferContentAndReset(&buf);
+
+ error:
+ virBufferFreeAndReset(&buf);
+ return NULL;
}
/* get the maximum ID of cpus in the host */
--
2.12.2
2:50 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
If formatting NUMA topology fails, the function returns
immediatelly,
but the buffer structure allocated on the stack references lot of
heap-allocated memory and that would get lost in such case.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/conf/capabilities.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 08907aced1b9..be95c50cfb67 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
if (caps->host.nnumaCell &&
virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell,
caps->host.numaCell) < 0)
- return NULL;
+ goto error;
Personally, I'd more like cleanup, but looking at other XML formatting methods,
I'm fine with this as well, at least we stay consistent.
for (i = 0; i < caps->host.nsecModels; i++) {
virBufferAddLit(&buf, "<secmodel>\n");
@@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
return NULL;
Git discarded the context here, so squash this in:
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index be95c50cf..ea6d4b19d 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1069,7 +1069,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAddLit(&buf, "</capabilities>\n");
if (virBufferCheckError(&buf) < 0)
- return NULL;
+ goto error;
return virBufferContentAndReset(&buf);
return virBufferContentAndReset(&buf);
+
+ error:
+ virBufferFreeAndReset(&buf);
+ return NULL;
}
/* get the maximum ID of cpus in the host */
--
2.12.2
ACK with the bit above squashed in.
Erik
2:59 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Thu, Apr 06, 2017 at 09:50:49 +0200, Erik Skultety wrote:
On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
> If formatting NUMA topology fails, the function returns immediatelly,
> but the buffer structure allocated on the stack references lot of
> heap-allocated memory and that would get lost in such case.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> src/conf/capabilities.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> index 08907aced1b9..be95c50cfb67 100644
> --- a/src/conf/capabilities.c
> +++ b/src/conf/capabilities.c
> @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> if (caps->host.nnumaCell &&
> virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell,
> caps->host.numaCell) < 0)
> - return NULL;
> + goto error;
Personally, I'd more like cleanup, but looking at other XML formatting methods,
I'm fine with this as well, at least we stay consistent.
"cleanup" label should be used if the success path passes through the
label as well. If only the error path passes through it it should be
called "error".
4:12 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Thu, Apr 06, 2017 at 09:50:49AM +0200, Erik Skultety wrote:
On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
> If formatting NUMA topology fails, the function returns immediatelly,
> but the buffer structure allocated on the stack references lot of
> heap-allocated memory and that would get lost in such case.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> src/conf/capabilities.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> index 08907aced1b9..be95c50cfb67 100644
> --- a/src/conf/capabilities.c
> +++ b/src/conf/capabilities.c
> @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> if (caps->host.nnumaCell &&
> virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell,
> caps->host.numaCell) < 0)
> - return NULL;
> + goto error;
Personally, I'd more like cleanup, but looking at other XML formatting methods,
I'm fine with this as well, at least we stay consistent.
>
> for (i = 0; i < caps->host.nsecModels; i++) {
> virBufferAddLit(&buf, "<secmodel>\n");
> @@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> return NULL;
>
Git discarded the context here, so squash this in:
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index be95c50cf..ea6d4b19d 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1069,7 +1069,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
virBufferAddLit(&buf, "</capabilities>\n");
if (virBufferCheckError(&buf) < 0)
- return NULL;
+ goto error;
return virBufferContentAndReset(&buf);
I don't really understand why would I need to do that.
> return virBufferContentAndReset(&buf);
> +
> + error:
> + virBufferFreeAndReset(&buf);
> + return NULL;
> }
>
> /* get the maximum ID of cpus in the host */
> --
> 2.12.2
>
ACK with the bit above squashed in.
Erik
4:29 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Thu, Apr 06, 2017 at 11:12:54AM +0200, Martin Kletzander wrote:
On Thu, Apr 06, 2017 at 09:50:49AM +0200, Erik Skultety wrote:
> On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
> > If formatting NUMA topology fails, the function returns immediatelly,
> > but the buffer structure allocated on the stack references lot of
> > heap-allocated memory and that would get lost in such case.
> >
> > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> > ---
> > src/conf/capabilities.c | 6 +++++-
> > 1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> > index 08907aced1b9..be95c50cfb67 100644
> > --- a/src/conf/capabilities.c
> > +++ b/src/conf/capabilities.c
> > @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > if (caps->host.nnumaCell &&
> > virCapabilitiesFormatNUMATopology(&buf, caps->host.nnumaCell,
> > caps->host.numaCell) < 0)
> > - return NULL;
> > + goto error;
>
> Personally, I'd more like cleanup, but looking at other XML formatting methods,
> I'm fine with this as well, at least we stay consistent.
>
> >
> > for (i = 0; i < caps->host.nsecModels; i++) {
> > virBufferAddLit(&buf, "<secmodel>\n");
> > @@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > return NULL;
> >
>
> Git discarded the context here, so squash this in:
>
> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> index be95c50cf..ea6d4b19d 100644
> --- a/src/conf/capabilities.c
> +++ b/src/conf/capabilities.c
> @@ -1069,7 +1069,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> virBufferAddLit(&buf, "</capabilities>\n");
>
> if (virBufferCheckError(&buf) < 0)
> - return NULL;
> + goto error;
>
> return virBufferContentAndReset(&buf);
>
I don't really understand why would I need to do that.
Because buf->content might be non-NULL.
>
> > return virBufferContentAndReset(&buf);
> > +
> > + error:
> > + virBufferFreeAndReset(&buf);
> > + return NULL;
> > }
> >
> > /* get the maximum ID of cpus in the host */
> > --
> > 2.12.2
> >
>
> ACK with the bit above squashed in.
>
> Erik
4:52 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Thu, Apr 06, 2017 at 11:29:21AM +0200, Erik Skultety wrote:
On Thu, Apr 06, 2017 at 11:12:54AM +0200, Martin Kletzander wrote:
> On Thu, Apr 06, 2017 at 09:50:49AM +0200, Erik Skultety wrote:
> > On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
> > > If formatting NUMA topology fails, the function returns immediatelly,
> > > but the buffer structure allocated on the stack references lot of
> > > heap-allocated memory and that would get lost in such case.
> > >
> > > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> > > ---
> > > src/conf/capabilities.c | 6 +++++-
> > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> > > index 08907aced1b9..be95c50cfb67 100644
> > > --- a/src/conf/capabilities.c
> > > +++ b/src/conf/capabilities.c
> > > @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > > if (caps->host.nnumaCell &&
> > > virCapabilitiesFormatNUMATopology(&buf,
caps->host.nnumaCell,
> > > caps->host.numaCell) < 0)
> > > - return NULL;
> > > + goto error;
> >
> > Personally, I'd more like cleanup, but looking at other XML formatting
methods,
> > I'm fine with this as well, at least we stay consistent.
> >
> > >
> > > for (i = 0; i < caps->host.nsecModels; i++) {
> > > virBufferAddLit(&buf, "<secmodel>\n");
> > > @@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > > return NULL;
> > >
> >
> > Git discarded the context here, so squash this in:
> >
> > diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> > index be95c50cf..ea6d4b19d 100644
> > --- a/src/conf/capabilities.c
> > +++ b/src/conf/capabilities.c
> > @@ -1069,7 +1069,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > virBufferAddLit(&buf, "</capabilities>\n");
> >
> > if (virBufferCheckError(&buf) < 0)
> > - return NULL;
> > + goto error;
> >
> > return virBufferContentAndReset(&buf);
> >
>
> I don't really understand why would I need to do that.
Because buf->content might be non-NULL.
Buffers are automatically reset on errors as there is no need for the
data. It also makes the function epilogues and error handling easier
and shorter (e.g. this case). See virBufferSetError() for more info.
>
> >
> > > return virBufferContentAndReset(&buf);
> > > +
> > > + error:
> > > + virBufferFreeAndReset(&buf);
> > > + return NULL;
> > > }
> > >
> > > /* get the maximum ID of cpus in the host */
> > > --
> > > 2.12.2
> > >
> >
> > ACK with the bit above squashed in.
> >
> > Erik
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
5:04 a.m.
New subject: [libvirt] [PATCH v2 01/12] conf: Fix possible memleak in capabilities
On Thu, Apr 06, 2017 at 11:52:54AM +0200, Martin Kletzander wrote:
On Thu, Apr 06, 2017 at 11:29:21AM +0200, Erik Skultety wrote:
> On Thu, Apr 06, 2017 at 11:12:54AM +0200, Martin Kletzander wrote:
> > On Thu, Apr 06, 2017 at 09:50:49AM +0200, Erik Skultety wrote:
> > > On Wed, Apr 05, 2017 at 04:36:24PM +0200, Martin Kletzander wrote:
> > > > If formatting NUMA topology fails, the function returns
immediatelly,
> > > > but the buffer structure allocated on the stack references lot of
> > > > heap-allocated memory and that would get lost in such case.
> > > >
> > > > Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> > > > ---
> > > > src/conf/capabilities.c | 6 +++++-
> > > > 1 file changed, 5 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> > > > index 08907aced1b9..be95c50cfb67 100644
> > > > --- a/src/conf/capabilities.c
> > > > +++ b/src/conf/capabilities.c
> > > > @@ -955,7 +955,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > > > if (caps->host.nnumaCell &&
> > > > virCapabilitiesFormatNUMATopology(&buf,
caps->host.nnumaCell,
> > > > caps->host.numaCell)
< 0)
> > > > - return NULL;
> > > > + goto error;
> > >
> > > Personally, I'd more like cleanup, but looking at other XML formatting
methods,
> > > I'm fine with this as well, at least we stay consistent.
> > >
> > > >
> > > > for (i = 0; i < caps->host.nsecModels; i++) {
> > > > virBufferAddLit(&buf, "<secmodel>\n");
> > > > @@ -1072,6 +1072,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > > > return NULL;
> > > >
> > >
> > > Git discarded the context here, so squash this in:
> > >
> > > diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
> > > index be95c50cf..ea6d4b19d 100644
> > > --- a/src/conf/capabilities.c
> > > +++ b/src/conf/capabilities.c
> > > @@ -1069,7 +1069,7 @@ virCapabilitiesFormatXML(virCapsPtr caps)
> > > virBufferAddLit(&buf, "</capabilities>\n");
> > >
> > > if (virBufferCheckError(&buf) < 0)
> > > - return NULL;
> > > + goto error;
> > >
> > > return virBufferContentAndReset(&buf);
> > >
> >
> > I don't really understand why would I need to do that.
>
> Because buf->content might be non-NULL.
>
Buffers are automatically reset on errors as there is no need for the
data. It also makes the function epilogues and error handling easier
and shorter (e.g. this case). See virBufferSetError() for more info.
Fair enough, I missed the VIR_FREE at the top of the function when I was looking
at it.
> >
> > >
> > > > return virBufferContentAndReset(&buf);
> > > > +
> > > > + error:
> > > > + virBufferFreeAndReset(&buf);
> > > > + return NULL;
> > > > }
> > > >
> > > > /* get the maximum ID of cpus in the host */
> > > > --
> > > > 2.12.2
> > > >
> > >
> > > ACK with the bit above squashed in.
> > >
> > > Erik
>
>
> --
> libvir-list mailing list
> libvir-list(a)redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
9:36 a.m.
New subject: [libvirt] [PATCH v2 02/12] util: Fix virDirRead() description
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/util/virfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index a91c2c349501..c0f448d3437d 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2861,11 +2861,11 @@ virDirOpenQuiet(DIR **dirp, const char *name)
/**
* virDirRead:
* @dirp: directory to read
- * @end: output one entry
+ * @ent: output one entry
* @name: if non-NULL, the name related to @dirp for use in error reporting
*
* Wrapper around readdir. Typical usage:
- * struct dirent ent;
+ * struct dirent *ent;
* int rc;
* DIR *dir;
* if (virDirOpen(&dir, name) < 0)
--
2.12.2
2:56 a.m.
New subject: [libvirt] [PATCH v2 02/12] util: Fix virDirRead() description
On Wed, Apr 05, 2017 at 04:36:25PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/util/virfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index a91c2c349501..c0f448d3437d 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2861,11 +2861,11 @@ virDirOpenQuiet(DIR **dirp, const char *name)
/**
* virDirRead:
* @dirp: directory to read
- * @end: output one entry
+ * @ent: output one entry
* @name: if non-NULL, the name related to @dirp for use in error reporting
*
* Wrapper around readdir. Typical usage:
- * struct dirent ent;
+ * struct dirent *ent;
* int rc;
* DIR *dir;
* if (virDirOpen(&dir, name) < 0)
--
2.12.2
ACK (could have gone straight in as trivial :)).
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 03/12] util: Add virStringTrimOptionalNewline
And use it in virFileRead*
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/util/virfile.c | 18 +++++++-----------
src/util/virhostcpu.c | 4 ++--
src/util/virstring.h | 8 ++++++++
src/util/virsysfs.c | 2 ++
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index c0f448d3437d..cbfa3849d793 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -3811,7 +3811,6 @@ int
virFileReadValueInt(const char *path, int *value)
{
char *str = NULL;
- char *endp = NULL;
if (!virFileExists(path))
return -2;
@@ -3819,8 +3818,9 @@ virFileReadValueInt(const char *path, int *value)
if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
return -1;
- if (virStrToLong_i(str, &endp, 10, value) < 0 ||
- (endp && !c_isspace(*endp))) {
+ virStringTrimOptionalNewline(str);
+
+ if (virStrToLong_i(str, NULL, 10, value) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid integer value '%s' in file
'%s'"),
str, path);
@@ -3847,7 +3847,6 @@ int
virFileReadValueUint(const char *path, unsigned int *value)
{
char *str = NULL;
- char *endp = NULL;
if (!virFileExists(path))
return -2;
@@ -3855,8 +3854,9 @@ virFileReadValueUint(const char *path, unsigned int *value)
if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
return -1;
- if (virStrToLong_uip(str, &endp, 10, value) < 0 ||
- (endp && !c_isspace(*endp))) {
+ virStringTrimOptionalNewline(str);
+
+ if (virStrToLong_uip(str, NULL, 10, value)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid unsigned integer value '%s' in file
'%s'"),
str, path);
@@ -3886,7 +3886,6 @@ virFileReadValueBitmap(const char *path,
{
char *buf = NULL;
int ret = -1;
- char *tmp = NULL;
if (!virFileExists(path))
return -2;
@@ -3894,10 +3893,7 @@ virFileReadValueBitmap(const char *path,
if (virFileReadAll(path, maxlen, &buf) < 0)
goto cleanup;
- /* trim optinoal newline at the end */
- tmp = buf + strlen(buf) - 1;
- if (*tmp == '\n')
- *tmp = '\0';
+ virStringTrimOptionalNewline(buf);
*value = virBitmapParseUnlimited(buf);
if (!*value)
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 02b9fc8eb94f..a660e3f4dbe5 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -847,13 +847,13 @@ virHostCPUParseCountLinux(void)
tmp = str;
do {
if (virStrToLong_i(tmp, &tmp, 10, &ret) < 0 ||
- !strchr(",-\n", *tmp)) {
+ !strchr(",-", *tmp)) {
virReportError(VIR_ERR_NO_SUPPORT,
_("failed to parse %s"), str);
ret = -1;
goto cleanup;
}
- } while (*tmp++ != '\n');
+ } while (*tmp++ && *tmp);
ret++;
cleanup:
diff --git a/src/util/virstring.h b/src/util/virstring.h
index a5550e30d2e2..603650aa1588 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -288,4 +288,12 @@ bool virStringBufferIsPrintable(const uint8_t *buf, size_t buflen);
char *virStringEncodeBase64(const uint8_t *buf, size_t buflen);
+static inline void
+virStringTrimOptionalNewline(char *str)
+{
+ char *tmp = str + strlen(str) - 1;
+ if (*tmp == '\n')
+ *tmp = '\0';
+}
+
#endif /* __VIR_STRING_H__ */
diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c
index 7a98b488e0ff..6df45a0e36d9 100644
--- a/src/util/virsysfs.c
+++ b/src/util/virsysfs.c
@@ -89,6 +89,8 @@ virSysfsGetValueString(const char *file,
if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0)
goto cleanup;
+ virStringTrimOptionalNewline(*value);
+
ret = 0;
cleanup:
VIR_FREE(path);
--
2.12.2
6:32 a.m.
New subject: [libvirt] [PATCH v2 03/12] util: Add virStringTrimOptionalNewline
On Wed, Apr 05, 2017 at 04:36:26PM +0200, Martin Kletzander wrote:
And use it in virFileRead*
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/util/virfile.c | 18 +++++++-----------
src/util/virhostcpu.c | 4 ++--
src/util/virstring.h | 8 ++++++++
src/util/virsysfs.c | 2 ++
4 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index c0f448d3437d..cbfa3849d793 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -3811,7 +3811,6 @@ int
virFileReadValueInt(const char *path, int *value)
{
char *str = NULL;
- char *endp = NULL;
if (!virFileExists(path))
return -2;
@@ -3819,8 +3818,9 @@ virFileReadValueInt(const char *path, int *value)
if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
return -1;
- if (virStrToLong_i(str, &endp, 10, value) < 0 ||
- (endp && !c_isspace(*endp))) {
+ virStringTrimOptionalNewline(str);
+
+ if (virStrToLong_i(str, NULL, 10, value) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid integer value '%s' in file
'%s'"),
str, path);
@@ -3847,7 +3847,6 @@ int
virFileReadValueUint(const char *path, unsigned int *value)
{
char *str = NULL;
- char *endp = NULL;
if (!virFileExists(path))
return -2;
@@ -3855,8 +3854,9 @@ virFileReadValueUint(const char *path, unsigned int *value)
if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
return -1;
- if (virStrToLong_uip(str, &endp, 10, value) < 0 ||
- (endp && !c_isspace(*endp))) {
+ virStringTrimOptionalNewline(str);
+
+ if (virStrToLong_uip(str, NULL, 10, value)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid unsigned integer value '%s' in file
'%s'"),
str, path);
@@ -3886,7 +3886,6 @@ virFileReadValueBitmap(const char *path,
{
char *buf = NULL;
int ret = -1;
- char *tmp = NULL;
if (!virFileExists(path))
return -2;
@@ -3894,10 +3893,7 @@ virFileReadValueBitmap(const char *path,
if (virFileReadAll(path, maxlen, &buf) < 0)
goto cleanup;
- /* trim optinoal newline at the end */
- tmp = buf + strlen(buf) - 1;
- if (*tmp == '\n')
- *tmp = '\0';
+ virStringTrimOptionalNewline(buf);
*value = virBitmapParseUnlimited(buf);
if (!*value)
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 02b9fc8eb94f..a660e3f4dbe5 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -847,13 +847,13 @@ virHostCPUParseCountLinux(void)
tmp = str;
do {
if (virStrToLong_i(tmp, &tmp, 10, &ret) < 0 ||
- !strchr(",-\n", *tmp)) {
+ !strchr(",-", *tmp)) {
virReportError(VIR_ERR_NO_SUPPORT,
_("failed to parse %s"), str);
ret = -1;
goto cleanup;
}
- } while (*tmp++ != '\n');
+ } while (*tmp++ && *tmp);
ret++;
cleanup:
diff --git a/src/util/virstring.h b/src/util/virstring.h
index a5550e30d2e2..603650aa1588 100644
--- a/src/util/virstring.h
+++ b/src/util/virstring.h
@@ -288,4 +288,12 @@ bool virStringBufferIsPrintable(const uint8_t *buf, size_t buflen);
char *virStringEncodeBase64(const uint8_t *buf, size_t buflen);
+static inline void
+virStringTrimOptionalNewline(char *str)
+{
+ char *tmp = str + strlen(str) - 1;
+ if (*tmp == '\n')
+ *tmp = '\0';
+}
Is there any other reason for using this instead of virTrimSpaces than just
being a bit faster? Because I think the performance gain in this case compared
to 1 iteration of the while loop is very small, thus if possible I would avoid
creating a function for it when there is virTrimSpaces (and I think
virSkipSpacesBackwards would be usable too).
Other than that, it makes perfect sense to me, ACK.
Erik
7:27 a.m.
New subject: [libvirt] [PATCH v2 03/12] util: Add virStringTrimOptionalNewline
On Thu, Apr 06, 2017 at 01:32:13PM +0200, Erik Skultety wrote:
On Wed, Apr 05, 2017 at 04:36:26PM +0200, Martin Kletzander wrote:
> And use it in virFileRead*
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> src/util/virfile.c | 18 +++++++-----------
> src/util/virhostcpu.c | 4 ++--
> src/util/virstring.h | 8 ++++++++
> src/util/virsysfs.c | 2 ++
> 4 files changed, 19 insertions(+), 13 deletions(-)
>
> diff --git a/src/util/virfile.c b/src/util/virfile.c
> index c0f448d3437d..cbfa3849d793 100644
> --- a/src/util/virfile.c
> +++ b/src/util/virfile.c
> @@ -3811,7 +3811,6 @@ int
> virFileReadValueInt(const char *path, int *value)
> {
> char *str = NULL;
> - char *endp = NULL;
>
> if (!virFileExists(path))
> return -2;
> @@ -3819,8 +3818,9 @@ virFileReadValueInt(const char *path, int *value)
> if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
> return -1;
>
> - if (virStrToLong_i(str, &endp, 10, value) < 0 ||
> - (endp && !c_isspace(*endp))) {
> + virStringTrimOptionalNewline(str);
> +
> + if (virStrToLong_i(str, NULL, 10, value) < 0) {
> virReportError(VIR_ERR_INTERNAL_ERROR,
> _("Invalid integer value '%s' in file
'%s'"),
> str, path);
> @@ -3847,7 +3847,6 @@ int
> virFileReadValueUint(const char *path, unsigned int *value)
> {
> char *str = NULL;
> - char *endp = NULL;
>
> if (!virFileExists(path))
> return -2;
> @@ -3855,8 +3854,9 @@ virFileReadValueUint(const char *path, unsigned int *value)
> if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
> return -1;
>
> - if (virStrToLong_uip(str, &endp, 10, value) < 0 ||
> - (endp && !c_isspace(*endp))) {
> + virStringTrimOptionalNewline(str);
> +
> + if (virStrToLong_uip(str, NULL, 10, value)) {
> virReportError(VIR_ERR_INTERNAL_ERROR,
> _("Invalid unsigned integer value '%s' in file
'%s'"),
> str, path);
> @@ -3886,7 +3886,6 @@ virFileReadValueBitmap(const char *path,
> {
> char *buf = NULL;
> int ret = -1;
> - char *tmp = NULL;
>
> if (!virFileExists(path))
> return -2;
> @@ -3894,10 +3893,7 @@ virFileReadValueBitmap(const char *path,
> if (virFileReadAll(path, maxlen, &buf) < 0)
> goto cleanup;
>
> - /* trim optinoal newline at the end */
> - tmp = buf + strlen(buf) - 1;
> - if (*tmp == '\n')
> - *tmp = '\0';
> + virStringTrimOptionalNewline(buf);
>
> *value = virBitmapParseUnlimited(buf);
> if (!*value)
> diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
> index 02b9fc8eb94f..a660e3f4dbe5 100644
> --- a/src/util/virhostcpu.c
> +++ b/src/util/virhostcpu.c
> @@ -847,13 +847,13 @@ virHostCPUParseCountLinux(void)
> tmp = str;
> do {
> if (virStrToLong_i(tmp, &tmp, 10, &ret) < 0 ||
> - !strchr(",-\n", *tmp)) {
> + !strchr(",-", *tmp)) {
> virReportError(VIR_ERR_NO_SUPPORT,
> _("failed to parse %s"), str);
> ret = -1;
> goto cleanup;
> }
> - } while (*tmp++ != '\n');
> + } while (*tmp++ && *tmp);
> ret++;
>
> cleanup:
> diff --git a/src/util/virstring.h b/src/util/virstring.h
> index a5550e30d2e2..603650aa1588 100644
> --- a/src/util/virstring.h
> +++ b/src/util/virstring.h
> @@ -288,4 +288,12 @@ bool virStringBufferIsPrintable(const uint8_t *buf, size_t
buflen);
>
> char *virStringEncodeBase64(const uint8_t *buf, size_t buflen);
>
> +static inline void
> +virStringTrimOptionalNewline(char *str)
> +{
> + char *tmp = str + strlen(str) - 1;
> + if (*tmp == '\n')
> + *tmp = '\0';
> +}
Is there any other reason for using this instead of virTrimSpaces than just
being a bit faster? Because I think the performance gain in this case compared
to 1 iteration of the while loop is very small, thus if possible I would avoid
creating a function for it when there is virTrimSpaces (and I think
virSkipSpacesBackwards would be usable too).
So, several factors:
1) I wasn't looking for functions that would do what I do here, I just
didn't want to be open-coding these three lines all the time.
2) I didn't want it to be a separate function (hence static inline in
the header file).
3) I didn't know we have functions like this.
4) Looking at these function I really don't like them. It's the
precise example on how trying to do everything makes it more
useless. It's doing super easy tiny thing that you want, but
because it "configurable", the code is..., well, let's say "not
very nice".
Having said that, I'm perfectly fine with changing it to using
virTrimSpaces() and hating those functions in my own free time. I'll
just add them to my list.
Other than that, it makes perfect sense to me, ACK.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 04/12] tests: Add virfilemock -- the new super mock
This mock (which is actually not mock at all, see later) can redirect
all accesses to a path into another path. There is no need to
create mocks for particular directories, you just create a directory
with all the data a redirect the test there.
In the future, this should also be able to register callbacks for
calls/paths, e.g. when the test is going to write into anything under
"/sys/devices", call function fce(); Then in the open() call we would
add information about the fd into some structure and in write() we
would call fce() with parameters like @path to write to, @data to
be written and pointer to optional return value, so that fce() itself
could stop the call from happening or change its behaviour. But
that's an idea for a latter day.
This is not a mock because it will not be preloaded, but compiled in
the test itself. See future patches for usage.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
cfg.mk | 2 +-
tests/virfilemock.c | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/virfilemock.h | 31 ++++++
3 files changed, 313 insertions(+), 1 deletion(-)
create mode 100644 tests/virfilemock.c
create mode 100644 tests/virfilemock.h
diff --git a/cfg.mk b/cfg.mk
index 89e03ca0e32c..52a684462457 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1117,7 +1117,7 @@ exclude_file_name_regexp--sc_copyright_usage = \
^COPYING(|\.LESSER)$$
exclude_file_name_regexp--sc_flags_usage = \
-
^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|test|usb)|nss|qemuxml2argv)mock\.c$$)
+
^(cfg\.mk|docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|test|usb|file)|nss|qemuxml2argv)mock\.c$$)
exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
^(src/rpc/gendispatch\.pl$$|tests/)
diff --git a/tests/virfilemock.c b/tests/virfilemock.c
new file mode 100644
index 000000000000..b199a64188a1
--- /dev/null
+++ b/tests/virfilemock.c
@@ -0,0 +1,281 @@
+/*
+ * virfilemock.c: Mock for universal file access mocking
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ */
+
+#include <config.h>
+
+#include "virmock.h"
+#include "virfilemock.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "viralloc.h"
+#include "virstring.h"
+#include "virfile.h"
+
+
+/* Mapping for prefix overrides */
+static size_t noverrides;
+static const char **overrides;
+
+/* nprefixes == noverrides, but two variables make it easier to use
+ * VIR_*_ELEMENT macros */
+static size_t nprefixes;
+static const char **prefixes;
+
+/* TODO: callbacks */
+
+
+static int (*real_open)(const char *path, int flags, ...);
+static FILE *(*real_fopen)(const char *path, const char *mode);
+static int (*real_access)(const char *path, int mode);
+static int (*real_stat)(const char *path, struct stat *sb);
+static int (*real___xstat)(int ver, const char *path, struct stat *sb);
+static int (*real_lstat)(const char *path, struct stat *sb);
+static int (*real___lxstat)(int ver, const char *path, struct stat *sb);
+static int (*real_mkdir)(const char *path, mode_t mode);
+static DIR *(*real_opendir)(const char *path);
+
+static void init_syms(void)
+{
+ if (real_fopen)
+ return;
+
+ VIR_MOCK_REAL_INIT(fopen);
+ VIR_MOCK_REAL_INIT(access);
+ VIR_MOCK_REAL_INIT_ALT(lstat, __lxstat);
+ VIR_MOCK_REAL_INIT_ALT(stat, __xstat);
+ VIR_MOCK_REAL_INIT(mkdir);
+ VIR_MOCK_REAL_INIT(open);
+ VIR_MOCK_REAL_INIT(opendir);
+}
+
+
+int
+virFileMockAddPrefix(const char *prefix,
+ const char *override)
+{
+ /* Both parameters are mandatory */
+ if (!prefix || !override)
+ return -1;
+
+ init_syms();
+
+ if (VIR_APPEND_ELEMENT_QUIET(prefixes, nprefixes, prefix) < 0 ||
+ VIR_APPEND_ELEMENT_QUIET(overrides, noverrides, override) < 0) {
+ VIR_FREE(prefixes);
+ VIR_FREE(overrides);
+ return -1;
+ }
+
+ return 0;
+}
+
+
+void
+virFileMockRemovePrefix(const char *prefix)
+{
+ size_t i = 0;
+
+ for (i = 0; i < noverrides; i++) {
+ if (STREQ(prefixes[i], prefix))
+ break;
+ }
+
+ if (i == noverrides)
+ return;
+
+ VIR_DELETE_ELEMENT(overrides, i, noverrides);
+ VIR_DELETE_ELEMENT(prefixes, i, nprefixes);
+}
+
+void
+virFileMockClearPrefixes(void)
+{
+ nprefixes = 0;
+ noverrides = 0;
+
+ VIR_FREE(prefixes);
+ VIR_FREE(overrides);
+}
+
+static char *
+virFileMockOverridePrefix(const char *path)
+{
+ char *ret = NULL;
+ size_t i = 0;
+
+ for (i = 0; i < noverrides; i++) {
+ const char *tmp = STRSKIP(path, prefixes[i]);
+
+ if (!tmp)
+ continue;
+
+ if (virAsprintfQuiet(&ret, "%s%s", overrides[i], tmp) < 0)
+ return NULL;
+
+ break;
+ }
+
+ if (!ret)
+ ignore_value(VIR_STRDUP_QUIET(ret, path));
+
+ return ret;
+}
+
+
+#define PATH_OVERRIDE(newpath, path) \
+ do { \
+ init_syms(); \
+ \
+ newpath = virFileMockOverridePrefix(path); \
+ if (!newpath) \
+ abort(); \
+ } while (0)
+
+
+FILE *fopen(const char *path, const char *mode)
+{
+ FILE *ret = NULL;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_fopen(newpath, mode);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int access(const char *path, int mode)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_access(newpath, mode);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int __lxstat(int ver, const char *path, struct stat *sb)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real___lxstat(ver, newpath, sb);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int lstat(const char *path, struct stat *sb)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_lstat(newpath, sb);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int __xstat(int ver, const char *path, struct stat *sb)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real___xstat(ver, newpath, sb);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int stat(const char *path, struct stat *sb)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_stat(newpath, sb);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int mkdir(const char *path, mode_t mode)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_mkdir(newpath, mode);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+int open(const char *path, int flags, ...)
+{
+ int ret = -1;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_open(newpath, flags);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
+
+DIR *opendir(const char *path)
+{
+ DIR *ret = NULL;
+ char *newpath = NULL;
+
+ PATH_OVERRIDE(newpath, path);
+
+ ret = real_opendir(newpath);
+
+ VIR_FREE(newpath);
+
+ return ret;
+}
diff --git a/tests/virfilemock.h b/tests/virfilemock.h
new file mode 100644
index 000000000000..eeca7d8b125a
--- /dev/null
+++ b/tests/virfilemock.h
@@ -0,0 +1,31 @@
+/*
+ * virfilemock.h: Mock for universal file access mocking
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>;.
+ */
+
+#ifndef __VIR_FILE_MOCK_H__
+
+int
+virFileMockAddPrefix(const char *prefix,
+ const char *override);
+
+void
+virFileMockRemovePrefix(const char *prefix);
+
+void
+virFileMockClearPrefixes(void);
+
+#endif /* __VIR_FILE_MOCK_H__ */
--
2.12.2
3:08 a.m.
New subject: [libvirt] [PATCH v2 04/12] tests: Add virfilemock -- the new super mock
+#include <config.h>
+
+#include "virmock.h"
+#include "virfilemock.h"
^^These are local, could you group them with the rest below the system ones?
(This was pointed out to me during review once or twice).
+
+#include <stdio.h>
+#include <stdlib.h>
^^These get pulled in by virmock.h, but it's always
nice to be explicit about
being able to use "printf" :P.
+#include <unistd.h>
I've successfully built the patch without ^^this header. You can drop it.
+#include <fcntl.h>
...
+#include <sys/stat.h>
+#include <sys/types.h>
It built without ^^these 2 as well.
+#include <dirent.h>
^This one gets pulled in by virfile.h
+
+#include "viralloc.h"
+#include "virstring.h"
+#include "virfile.h"
+
+
+/* Mapping for prefix overrides */
+static size_t noverrides;
+static const char **overrides;
+
+/* nprefixes == noverrides, but two variables make it easier to use
+ * VIR_*_ELEMENT macros */
+static size_t nprefixes;
+static const char **prefixes;
+
+/* TODO: callbacks */
Just out of curiosity, what callbacks?
[...]
+
+
+void
+virFileMockRemovePrefix(const char *prefix)
+{
+ size_t i = 0;
+
+ for (i = 0; i < noverrides; i++) {
+ if (STREQ(prefixes[i], prefix))
Since you're removing a single element, you can just delete the prefix here and
then break from the loop.
+ break;
+ }
+
+ if (i == noverrides)
+ return;
You won't be needing ^^this then.
+
+ VIR_DELETE_ELEMENT(overrides, i, noverrides);
+ VIR_DELETE_ELEMENT(prefixes, i, nprefixes);
+}
+
ACK with the adjustments (with the exception if it would somehow break BSD
again :)).
Erik
3:30 a.m.
New subject: [libvirt] [PATCH v2 04/12] tests: Add virfilemock -- the new super mock
On Fri, Apr 07, 2017 at 10:08:35AM +0200, Erik Skultety wrote:
> +#include <config.h>
> +
> +#include "virmock.h"
> +#include "virfilemock.h"
^^These are local, could you group them with the rest below the system ones?
(This was pointed out to me during review once or twice).
> +
> +#include <stdio.h>
> +#include <stdlib.h>
^^These get pulled in by virmock.h, but it's always nice to be explicit about
being able to use "printf" :P.
> +#include <unistd.h>
I've successfully built the patch without ^^this header. You can drop it.
> +#include <fcntl.h>
...
> +#include <sys/stat.h>
> +#include <sys/types.h>
It built without ^^these 2 as well.
> +#include <dirent.h>
^This one gets pulled in by virfile.h
> +
> +#include "viralloc.h"
> +#include "virstring.h"
> +#include "virfile.h"
> +
> +
> +/* Mapping for prefix overrides */
> +static size_t noverrides;
> +static const char **overrides;
> +
> +/* nprefixes == noverrides, but two variables make it easier to use
> + * VIR_*_ELEMENT macros */
> +static size_t nprefixes;
> +static const char **prefixes;
> +
> +/* TODO: callbacks */
Just out of curiosity, what callbacks?
[...]
> +
> +
> +void
> +virFileMockRemovePrefix(const char *prefix)
> +{
> + size_t i = 0;
> +
> + for (i = 0; i < noverrides; i++) {
> + if (STREQ(prefixes[i], prefix))
Since you're removing a single element, you can just delete the prefix here and
then break from the loop.
> + break;
> + }
> +
> + if (i == noverrides)
> + return;
You won't be needing ^^this then.
> +
> + VIR_DELETE_ELEMENT(overrides, i, noverrides);
> + VIR_DELETE_ELEMENT(prefixes, i, nprefixes);
> +}
> +
ACK with the adjustments (with the exception if it would somehow break BSD
again :)).
You'll also need to add virfilemock.h to tests/Makefile.am EXTRA_DIST otherwise
make distcheck fails with "No such file or directory".
Erik
Erik
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
4:41 a.m.
New subject: [libvirt] [PATCH v2 04/12] tests: Add virfilemock -- the new super mock
On Fri, Apr 07, 2017 at 10:08:35AM +0200, Erik Skultety wrote:
> +#include <config.h>
> +
> +#include "virmock.h"
> +#include "virfilemock.h"
^^These are local, could you group them with the rest below the system ones?
(This was pointed out to me during review once or twice).
Yeah, I forgot to get to the header cleaning part. Most of this was
copy-paste from cgroupmock and then I just added my new header.
> +
> +#include <stdio.h>
> +#include <stdlib.h>
^^These get pulled in by virmock.h, but it's always nice to be explicit about
being able to use "printf" :P.
> +#include <unistd.h>
I've successfully built the patch without ^^this header. You can drop it.
> +#include <fcntl.h>
...
> +#include <sys/stat.h>
> +#include <sys/types.h>
It built without ^^these 2 as well.
> +#include <dirent.h>
^This one gets pulled in by virfile.h
> +
> +#include "viralloc.h"
> +#include "virstring.h"
> +#include "virfile.h"
> +
> +
> +/* Mapping for prefix overrides */
> +static size_t noverrides;
> +static const char **overrides;
> +
> +/* nprefixes == noverrides, but two variables make it easier to use
> + * VIR_*_ELEMENT macros */
> +static size_t nprefixes;
> +static const char **prefixes;
> +
> +/* TODO: callbacks */
Just out of curiosity, what callbacks?
See commit message. I don't like repeating myself. Or should I copy
the commit message to the comment?
[...]
> +
> +
> +void
> +virFileMockRemovePrefix(const char *prefix)
> +{
> + size_t i = 0;
> +
> + for (i = 0; i < noverrides; i++) {
> + if (STREQ(prefixes[i], prefix))
Since you're removing a single element, you can just delete the prefix here and
then break from the loop.
Yeah, thta was the first variant I went with, but then I didn't like the
extra indentation level, so I changed it to this. Can we get a hacking
file section talking about this? I don't like repainting the shed every
new series.
> + break;
> + }
> +
> + if (i == noverrides)
> + return;
You won't be needing ^^this then.
> +
> + VIR_DELETE_ELEMENT(overrides, i, noverrides);
> + VIR_DELETE_ELEMENT(prefixes, i, nprefixes);
> +}
> +
ACK with the adjustments (with the exception if it would somehow break BSD
again :)).
I'll try to check this one (and the following ones as well) on BSD
before pushing. Hopefully I'll manage to install the machine before
going home.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 05/12] util: Remove virsysfs and instead enhance virFileReadValue* functions
It is no longer needed thanks to the great virfilemock.c. And this
way we don't have to add a new set of functions for each prefixed
path.
While on that, add two functions that weren't there before, string and
scaled integer reading ones. Also increase the length of the string
being read by one to accompany for the optional newline at the
end (i.e. change INT_STRLEN_BOUND to INT_BUFSIZE_BOUND).
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/Makefile.am | 2 -
src/conf/capabilities.c | 1 -
src/libvirt_private.syms | 16 +---
src/util/virfile.c | 204 ++++++++++++++++++++++++++++++++++-------
src/util/virfile.h | 14 ++-
src/util/virhostcpu.c | 43 +++++----
src/util/virsysfs.c | 231 -----------------------------------------------
src/util/virsysfs.h | 70 --------------
src/util/virsysfspriv.h | 28 ------
tests/Makefile.am | 5 +-
tests/vircaps2xmltest.c | 6 +-
tests/virhostcputest.c | 8 +-
tests/virnumamock.c | 15 +--
13 files changed, 228 insertions(+), 415 deletions(-)
delete mode 100644 src/util/virsysfs.c
delete mode 100644 src/util/virsysfs.h
delete mode 100644 src/util/virsysfspriv.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 75e4344198c5..f04d262952e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,6 @@ UTIL_SOURCES = \
util/virstorageencryption.c util/virstorageencryption.h \
util/virstoragefile.c util/virstoragefile.h \
util/virstring.h util/virstring.c \
- util/virsysfs.c util/virsysfs.h util/virsysfspriv.h \
util/virsysinfo.c util/virsysinfo.h util/virsysinfopriv.h \
util/virsystemd.c util/virsystemd.h util/virsystemdpriv.h \
util/virthread.c util/virthread.h \
@@ -2586,7 +2585,6 @@ libvirt_setuid_rpc_client_la_SOURCES = \
util/virrandom.c \
util/virsocketaddr.c \
util/virstring.c \
- util/virsysfs.c \
util/virsystemd.c \
util/virtime.c \
util/virthread.c \
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index be95c50cfb67..7ed76e65b1a1 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -45,7 +45,6 @@
#include "virlog.h"
#include "virnuma.h"
#include "virstring.h"
-#include "virsysfs.h"
#include "virtypedparam.h"
#include "viruuid.h"
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 92083e54142d..d399e0dc063a 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1632,6 +1632,8 @@ virFileReadLimFD;
virFileReadLink;
virFileReadValueBitmap;
virFileReadValueInt;
+virFileReadValueScaledInt;
+virFileReadValueString;
virFileReadValueUint;
virFileRelLinkPointsTo;
virFileRemove;
@@ -2620,20 +2622,6 @@ virTrimSpaces;
virVasprintfInternal;
-# util/virsysfs.h
-virSysfsGetCpuValueBitmap;
-virSysfsGetCpuValueInt;
-virSysfsGetCpuValueString;
-virSysfsGetCpuValueUint;
-virSysfsGetNodeValueBitmap;
-virSysfsGetNodeValueString;
-virSysfsGetSystemPath;
-virSysfsGetValueBitmap;
-virSysfsGetValueInt;
-virSysfsGetValueString;
-virSysfsSetSystemPath;
-
-
# util/virsysinfo.h
virSysinfoBaseBoardDefClear;
virSysinfoBIOSDefFree;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index cbfa3849d793..c594b5782800 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -3799,24 +3799,36 @@ virFileComparePaths(const char *p1, const char *p2)
/**
* virFileReadValueInt:
- * @path: file to read from
* @value: pointer to int to be filled in with the value
+ * @format, ...: file to read from
*
- * Read int from @path and put it into @value.
+ * Read int from @format and put it into @value.
*
* Return -2 for non-existing file, -1 on other errors and 0 if everything went
* fine.
*/
int
-virFileReadValueInt(const char *path, int *value)
+virFileReadValueInt(int *value, const char *format, ...)
{
+ int ret = -1;
char *str = NULL;
+ char *path = NULL;
+ va_list ap;
- if (!virFileExists(path))
- return -2;
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
- if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
- return -1;
+ if (!virFileExists(path)) {
+ ret = -2;
+ goto cleanup;
+ }
+
+ if (virFileReadAll(path, INT_BUFSIZE_BOUND(*value), &str) < 0)
+ goto cleanup;
virStringTrimOptionalNewline(str);
@@ -3824,83 +3836,205 @@ virFileReadValueInt(const char *path, int *value)
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid integer value '%s' in file
'%s'"),
str, path);
- return -1;
+ goto cleanup;
}
+ ret = 0;
+ cleanup:
+ VIR_FREE(path);
VIR_FREE(str);
-
- return 0;
+ return ret;
}
/**
* virFileReadValueUint:
- * @path: file to read from
- * @value: pointer to unsigned int to be filled in with the value
+ * @value: pointer to int to be filled in with the value
+ * @format, ...: file to read from
*
- * Read int from @path and put it into @value.
+ * Read unsigned int from @format and put it into @value.
*
* Return -2 for non-existing file, -1 on other errors and 0 if everything went
* fine.
*/
int
-virFileReadValueUint(const char *path, unsigned int *value)
+virFileReadValueUint(unsigned int *value, const char *format, ...)
{
+ int ret = -1;
char *str = NULL;
+ char *path = NULL;
+ va_list ap;
- if (!virFileExists(path))
- return -2;
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
- if (virFileReadAll(path, INT_STRLEN_BOUND(*value), &str) < 0)
- return -1;
+ if (!virFileExists(path)) {
+ ret = -2;
+ goto cleanup;
+ }
+
+ if (virFileReadAll(path, INT_BUFSIZE_BOUND(*value), &str) < 0)
+ goto cleanup;
virStringTrimOptionalNewline(str);
- if (virStrToLong_uip(str, NULL, 10, value)) {
+ if (virStrToLong_uip(str, NULL, 10, value) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid unsigned integer value '%s' in file
'%s'"),
str, path);
- return -1;
+ goto cleanup;
}
+ ret = 0;
+ cleanup:
+ VIR_FREE(path);
VIR_FREE(str);
+ return ret;
+}
- return 0;
+
+/* Arbitrarily sized number, feel free to change, but the function should be
+ * used for small, interface-like files, so it should not be huge (subjective) */
+#define VIR_FILE_READ_VALUE_STRING_MAX 4096
+
+/**
+ * virFileReadValueScaledInt:
+ * @value: pointer to unsigned long long int to be filled in with the value
+ * @format, ...: file to read from
+ *
+ * Read unsigned scaled int from @format and put it into @value.
+ *
+ * Return -2 for non-existing file, -1 on other errors and 0 if everything went
+ * fine.
+ */
+int
+virFileReadValueScaledInt(unsigned long long *value, const char *format, ...)
+{
+ int ret = -1;
+ char *str = NULL;
+ char *endp = NULL;
+ char *path = NULL;
+ va_list ap;
+
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
+
+ if (!virFileExists(path)) {
+ ret = -2;
+ goto cleanup;
+ }
+
+ if (virFileReadAll(path, INT_BUFSIZE_BOUND(*value), &str) < 0)
+ goto cleanup;
+
+ virStringTrimOptionalNewline(str);
+
+ if (virStrToLong_ullp(str, &endp, 10, value) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Invalid unsigned scaled integer value '%s' in file
'%s'"),
+ str, path);
+ goto cleanup;
+ }
+
+ ret = virScaleInteger(value, endp, 1024, ULLONG_MAX);
+ cleanup:
+ VIR_FREE(path);
+ VIR_FREE(str);
+ return ret;
}
/**
* virFileReadValueBitmap:
- * @path: file to read from
- * @value: double pointer to virBitmap to be allocated and filled in with the
- * value
+ * @value: pointer to virBitmapPtr to be allocated and filled in with the value
+ * @format, ...: file to read from
*
- * Read int from @path and put it into @value.
+ * Read int from @format and put it into @value.
*
* Return -2 for non-existing file, -1 on other errors and 0 if everything went
* fine.
*/
int
-virFileReadValueBitmap(const char *path,
- int maxlen,
- virBitmapPtr *value)
+virFileReadValueBitmap(virBitmapPtr *value, const char *format, ...)
{
- char *buf = NULL;
int ret = -1;
+ char *str = NULL;
+ char *path = NULL;
+ va_list ap;
- if (!virFileExists(path))
- return -2;
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
- if (virFileReadAll(path, maxlen, &buf) < 0)
+ if (!virFileExists(path)) {
+ ret = -2;
goto cleanup;
+ }
- virStringTrimOptionalNewline(buf);
+ if (virFileReadAll(path, VIR_FILE_READ_VALUE_STRING_MAX, &str) < 0)
+ goto cleanup;
- *value = virBitmapParseUnlimited(buf);
+ virStringTrimOptionalNewline(str);
+
+ *value = virBitmapParseUnlimited(str);
if (!*value)
goto cleanup;
ret = 0;
cleanup:
- VIR_FREE(buf);
+ VIR_FREE(path);
+ VIR_FREE(str);
+ return ret;
+}
+
+/**
+ * virFileReadValueString:
+ * @value: pointer to char * to be allocated and filled in with the value
+ * @format, ...: file to read from
+ *
+ * Read string from @format and put it into @value. Don't get this mixed with
+ * virFileReadAll(). This function is a wrapper over it with the behaviour
+ * aligned to other virFileReadValue* functions
+ *
+ * Return -2 for non-existing file, -1 on other errors and 0 if everything went
+ * fine.
+ */
+int
+virFileReadValueString(char **value, const char *format, ...)
+{
+ int ret = -1;
+ char *str = NULL;
+ char *path = NULL;
+ va_list ap;
+
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
+
+ if (!virFileExists(path)) {
+ ret = -2;
+ goto cleanup;
+ }
+
+ ret = virFileReadAll(path, VIR_FILE_READ_VALUE_STRING_MAX, value);
+
+ if (*value)
+ virStringTrimOptionalNewline(*value);
+ cleanup:
+ VIR_FREE(path);
+ VIR_FREE(str);
return ret;
}
diff --git a/src/util/virfile.h b/src/util/virfile.h
index ba1c57c06a8e..6617b9e02407 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -336,8 +336,16 @@ int virFileCopyACLs(const char *src,
int virFileComparePaths(const char *p1, const char *p2);
-int virFileReadValueInt(const char *path, int *value);
-int virFileReadValueUint(const char *path, unsigned int *value);
-int virFileReadValueBitmap(const char *path, int maxlen, virBitmapPtr *value);
+int virFileReadValueInt(int *value, const char *format, ...)
+ ATTRIBUTE_FMT_PRINTF(2, 3);
+int virFileReadValueUint(unsigned int *value, const char *format, ...)
+ ATTRIBUTE_FMT_PRINTF(2, 3);
+int virFileReadValueBitmap(virBitmapPtr *value, const char *format, ...)
+ ATTRIBUTE_FMT_PRINTF(2, 3);
+int virFileReadValueScaledInt(unsigned long long *value, const char *format, ...)
+ ATTRIBUTE_FMT_PRINTF(2, 3);
+int virFileReadValueString(char **value, const char *format, ...)
+ ATTRIBUTE_FMT_PRINTF(2, 3);
+
#endif /* __VIR_FILE_H */
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index a660e3f4dbe5..fd1ac9b8030e 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -56,7 +56,6 @@
#include "virfile.h"
#include "virtypedparam.h"
#include "virstring.h"
-#include "virsysfs.h"
#include "virnuma.h"
#include "virlog.h"
@@ -192,6 +191,7 @@ virHostCPUGetStatsFreeBSD(int cpuNum,
#ifdef __linux__
# define CPUINFO_PATH "/proc/cpuinfo"
# define PROCSTAT_PATH "/proc/stat"
+# define SYSFS_SYSTEM_PATH "/sys/devices/system"
# define VIR_HOST_CPU_MASK_LEN 1024
# define LINUX_NB_CPU_STATS 4
@@ -205,7 +205,10 @@ virHostCPUCountThreadSiblings(unsigned int cpu)
char *str = NULL;
size_t i;
- rv = virSysfsGetCpuValueString(cpu, "topology/thread_siblings", &str);
+ rv = virFileReadValueString(&str,
+ SYSFS_SYSTEM_PATH
+ "/cpu/cpu%u/topology/thread_siblings",
+ cpu);
if (rv == -2) {
ret = 1;
goto cleanup;
@@ -227,9 +230,10 @@ int
virHostCPUGetSocket(unsigned int cpu, unsigned int *socket)
{
int tmp;
- int ret = virSysfsGetCpuValueInt(cpu,
- "topology/physical_package_id",
- &tmp);
+ int ret = virFileReadValueInt(&tmp,
+ SYSFS_SYSTEM_PATH
+ "/cpu/cpu%u/topology/physical_package_id",
+ cpu);
/* If the file is not there, it's 0 */
if (ret == -2)
@@ -251,7 +255,10 @@ virHostCPUGetSocket(unsigned int cpu, unsigned int *socket)
int
virHostCPUGetCore(unsigned int cpu, unsigned int *core)
{
- int ret = virSysfsGetCpuValueUint(cpu, "topology/core_id", core);
+ int ret = virFileReadValueUint(core,
+ SYSFS_SYSTEM_PATH
+ "/cpu/cpu%u/topology/core_id",
+ cpu);
/* If the file is not there, it's 0 */
if (ret == -2)
@@ -268,7 +275,10 @@ virHostCPUGetSiblingsList(unsigned int cpu)
virBitmapPtr ret = NULL;
int rv = -1;
- rv = virSysfsGetCpuValueBitmap(cpu, "topology/thread_siblings_list",
&ret);
+ rv = virFileReadValueBitmap(&ret,
+ SYSFS_SYSTEM_PATH
+ "/cpu/cpu%u/topology/thread_siblings_list",
+ cpu);
if (rv == -2) {
/* If the file doesn't exist, the threadis its only sibling */
ret = virBitmapNew(cpu + 1);
@@ -615,7 +625,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
/* OK, we've parsed clock speed out of /proc/cpuinfo. Get the
* core, node, socket, thread and topology information from /sys
*/
- if (virAsprintf(&sysfs_nodedir, "%s/node", virSysfsGetSystemPath())
< 0)
+ if (virAsprintf(&sysfs_nodedir, SYSFS_SYSTEM_PATH "/node") < 0)
goto cleanup;
if (virDirOpenQuiet(&nodedir, sysfs_nodedir) < 0) {
@@ -659,8 +669,8 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
(*nodes)++;
- if (virAsprintf(&sysfs_cpudir, "%s/node/%s",
- virSysfsGetSystemPath(), nodedirent->d_name) < 0)
+ if (virAsprintf(&sysfs_cpudir, SYSFS_SYSTEM_PATH "/node/%s",
+ nodedirent->d_name) < 0)
goto cleanup;
if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch,
@@ -694,7 +704,7 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
fallback:
VIR_FREE(sysfs_cpudir);
- if (virAsprintf(&sysfs_cpudir, "%s/cpu", virSysfsGetSystemPath()) <
0)
+ if (virAsprintf(&sysfs_cpudir, SYSFS_SYSTEM_PATH "/cpu") < 0)
goto cleanup;
if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch,
@@ -841,7 +851,7 @@ virHostCPUParseCountLinux(void)
char *tmp;
int ret = -1;
- if (virSysfsGetValueString("cpu/present", &str) < 0)
+ if (virFileReadValueString(&str, SYSFS_SYSTEM_PATH "/cpu/present") <
0)
return -1;
tmp = str;
@@ -866,8 +876,9 @@ int
virHostCPUGetOnline(unsigned int cpu, bool *online)
{
unsigned int tmp = 0;
- int ret = virSysfsGetCpuValueUint(cpu, "online", &tmp);
-
+ int ret = virFileReadValueUint(&tmp,
+ SYSFS_SYSTEM_PATH "/cpu/cpu%u/online",
+ cpu);
/* If the file is not there, it's online (doesn't support offlining) */
if (ret == -2)
@@ -1032,7 +1043,7 @@ virHostCPUGetPresentBitmap(void)
#ifdef __linux__
virBitmapPtr ret = NULL;
- virSysfsGetValueBitmap("cpu/present", &ret);
+ virFileReadValueBitmap(&ret, SYSFS_SYSTEM_PATH "/cpu/present");
return ret;
#else
@@ -1048,7 +1059,7 @@ virHostCPUGetOnlineBitmap(void)
#ifdef __linux__
virBitmapPtr ret = NULL;
- virSysfsGetValueBitmap("cpu/online", &ret);
+ virFileReadValueBitmap(&ret, SYSFS_SYSTEM_PATH "/cpu/online");
return ret;
#else
diff --git a/src/util/virsysfs.c b/src/util/virsysfs.c
deleted file mode 100644
index 6df45a0e36d9..000000000000
--- a/src/util/virsysfs.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * virsysfs.c: Helper functions for manipulating sysfs files
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- * Author: Martin Kletzander <mkletzan(a)redhat.com>
- */
-
-#include <config.h>
-
-#include "internal.h"
-
-#include "virsysfspriv.h"
-
-#include "viralloc.h"
-#include "virfile.h"
-#include "virlog.h"
-#include "virstring.h"
-
-#define VIR_FROM_THIS VIR_FROM_NONE
-
-VIR_LOG_INIT("util.sysfs");
-
-
-#define VIR_SYSFS_VALUE_MAXLEN 8192
-#define SYSFS_SYSTEM_PATH "/sys/devices/system"
-
-static const char *sysfs_system_path = SYSFS_SYSTEM_PATH;
-
-
-void virSysfsSetSystemPath(const char *path)
-{
- if (path)
- sysfs_system_path = path;
- else
- sysfs_system_path = SYSFS_SYSTEM_PATH;
-}
-
-
-const char *
-virSysfsGetSystemPath(void)
-{
- return sysfs_system_path;
-}
-
-int
-virSysfsGetValueInt(const char *file,
- int *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/%s", sysfs_system_path, file) < 0)
- return -1;
-
- ret = virFileReadValueInt(path, value);
-
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetValueString(const char *file,
- char **value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/%s", sysfs_system_path, file) < 0)
- return -1;
-
- if (!virFileExists(path)) {
- ret = -2;
- goto cleanup;
- }
-
- if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0)
- goto cleanup;
-
- virStringTrimOptionalNewline(*value);
-
- ret = 0;
- cleanup:
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetValueBitmap(const char *file,
- virBitmapPtr *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/%s", sysfs_system_path, file) < 0)
- return -1;
-
- ret = virFileReadValueBitmap(path, VIR_SYSFS_VALUE_MAXLEN, value);
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetCpuValueInt(unsigned int cpu,
- const char *file,
- int *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file)
< 0)
- return -1;
-
- ret = virFileReadValueInt(path, value);
-
- VIR_FREE(path);
- return ret;
-}
-
-
-int
-virSysfsGetCpuValueUint(unsigned int cpu,
- const char *file,
- unsigned int *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file)
< 0)
- return -1;
-
- ret = virFileReadValueUint(path, value);
-
- VIR_FREE(path);
- return ret;
-}
-
-
-int
-virSysfsGetCpuValueString(unsigned int cpu,
- const char *file,
- char **value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file)
< 0)
- return -1;
-
- if (!virFileExists(path)) {
- ret = -2;
- goto cleanup;
- }
-
- if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0)
- goto cleanup;
-
- ret = 0;
- cleanup:
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetCpuValueBitmap(unsigned int cpu,
- const char *file,
- virBitmapPtr *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/cpu/cpu%u/%s", sysfs_system_path, cpu, file)
< 0)
- return -1;
-
- ret = virFileReadValueBitmap(path, VIR_SYSFS_VALUE_MAXLEN, value);
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetNodeValueString(unsigned int node,
- const char *file,
- char **value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/node/node%u/%s", sysfs_system_path, node,
file) < 0)
- return -1;
-
- if (!virFileExists(path)) {
- ret = -2;
- goto cleanup;
- }
-
- if (virFileReadAll(path, VIR_SYSFS_VALUE_MAXLEN, value) < 0)
- goto cleanup;
-
- ret = 0;
- cleanup:
- VIR_FREE(path);
- return ret;
-}
-
-int
-virSysfsGetNodeValueBitmap(unsigned int node,
- const char *file,
- virBitmapPtr *value)
-{
- char *path = NULL;
- int ret = -1;
-
- if (virAsprintf(&path, "%s/node/node%u/%s", sysfs_system_path, node,
file) < 0)
- return -1;
-
- ret = virFileReadValueBitmap(path, VIR_SYSFS_VALUE_MAXLEN, value);
- VIR_FREE(path);
- return ret;
-}
diff --git a/src/util/virsysfs.h b/src/util/virsysfs.h
deleted file mode 100644
index cd871ff11dd1..000000000000
--- a/src/util/virsysfs.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * virsysfs.h: Helper functions for manipulating sysfs files
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- * Author: Martin Kletzander <mkletzan(a)redhat.com>
- */
-
-#ifndef __VIR_SYSFS_H__
-# define __VIR_SYSFS_H__
-
-# include "internal.h"
-# include "virbitmap.h"
-
-const char * virSysfsGetSystemPath(void);
-
-int
-virSysfsGetValueInt(const char *file,
- int *value);
-
-int
-virSysfsGetValueString(const char *file,
- char **value);
-
-int
-virSysfsGetValueBitmap(const char *file,
- virBitmapPtr *value);
-
-int
-virSysfsGetCpuValueInt(unsigned int cpu,
- const char *file,
- int *value);
-int
-virSysfsGetCpuValueUint(unsigned int cpu,
- const char *file,
- unsigned int *value);
-
-int
-virSysfsGetCpuValueString(unsigned int cpu,
- const char *file,
- char **value);
-
-int
-virSysfsGetCpuValueBitmap(unsigned int cpu,
- const char *file,
- virBitmapPtr *value);
-
-int
-virSysfsGetNodeValueString(unsigned int node,
- const char *file,
- char **value);
-
-int
-virSysfsGetNodeValueBitmap(unsigned int cpu,
- const char *file,
- virBitmapPtr *value);
-
-#endif /* __VIR_SYSFS_H__*/
diff --git a/src/util/virsysfspriv.h b/src/util/virsysfspriv.h
deleted file mode 100644
index ae9f54a40c2a..000000000000
--- a/src/util/virsysfspriv.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * virsysfspriv.h: Helper functions for manipulating sysfs files
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>;.
- *
- * Author: Martin Kletzander <mkletzan(a)redhat.com>
- */
-
-#ifndef __VIR_SYSFS_PRIV_H__
-# define __VIR_SYSFS_PRIV_H__
-
-# include "virsysfs.h"
-
-void virSysfsSetSystemPath(const char *path);
-
-#endif /* __VIR_SYSFS_PRIV_H__*/
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa9d2eb3a343..f6306a3c1416 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -928,7 +928,7 @@ virconftest_SOURCES = \
virconftest_LDADD = $(LDADDS)
virhostcputest_SOURCES = \
- virhostcputest.c testutils.h testutils.c
+ virhostcputest.c testutils.h testutils.c virfilemock.c
virhostcputest_LDADD = $(LDADDS)
commandtest_SOURCES = \
@@ -1145,7 +1145,7 @@ virhostcpumock_la_LIBADD = $(MOCKLIBS_LIBS)
if WITH_LINUX
vircaps2xmltest_SOURCES = \
- vircaps2xmltest.c testutils.h testutils.c
+ vircaps2xmltest.c testutils.h testutils.c virfilemock.c
vircaps2xmltest_LDADD = $(LDADDS)
virnumamock_la_SOURCES = \
@@ -1153,6 +1153,7 @@ virnumamock_la_SOURCES = \
virnumamock_la_CFLAGS = $(AM_CFLAGS)
virnumamock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virnumamock_la_LIBADD = $(MOCKLIBS_LIBS)
+
else ! WITH_LINUX
EXTRA_DIST += vircaps2xmltest.c virnumamock.c
endif ! WITH_LINUX
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 670bb8c375b3..af422238520b 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -25,7 +25,7 @@
#include "testutils.h"
#include "capabilities.h"
#include "virbitmap.h"
-#include "virsysfspriv.h"
+#include "virfilemock.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@@ -52,7 +52,7 @@ test_virCapabilities(const void *opaque)
abs_srcdir, data->filename) < 0)
goto cleanup;
- virSysfsSetSystemPath(dir);
+ virFileMockAddPrefix("/sys/devices/system", dir);
caps = virCapabilitiesNew(data->arch, data->offlineMigrate,
data->liveMigrate);
if (!caps)
@@ -61,7 +61,7 @@ test_virCapabilities(const void *opaque)
if (virCapabilitiesInitNUMA(caps) < 0)
goto cleanup;
- virSysfsSetSystemPath(NULL);
+ virFileMockClearPrefixes();
if (!(capsXML = virCapabilitiesFormatXML(caps)))
goto cleanup;
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index b415ec5f1b08..6372fefd6f94 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -8,12 +8,14 @@
#include "testutils.h"
#include "internal.h"
#include "virhostcpupriv.h"
-#include "virsysfspriv.h"
#include "virfile.h"
#include "virstring.h"
+#include "virfilemock.h"
#define VIR_FROM_THIS VIR_FROM_NONE
+#define SYSFS_SYSTEM_PATH "/sys/devices/system"
+
#if !(defined __linux__)
int
@@ -178,9 +180,9 @@ linuxTestHostCPU(const void *opaque)
goto cleanup;
}
- virSysfsSetSystemPath(sysfs_prefix);
+ virFileMockAddPrefix(SYSFS_SYSTEM_PATH, sysfs_prefix);
result = linuxTestCompareFiles(cpuinfo, data->arch, output);
- virSysfsSetSystemPath(NULL);
+ virFileMockRemovePrefix(SYSFS_SYSTEM_PATH);
cleanup:
VIR_FREE(cpuinfo);
diff --git a/tests/virnumamock.c b/tests/virnumamock.c
index 210d15d6adf0..9c724536e85b 100644
--- a/tests/virnumamock.c
+++ b/tests/virnumamock.c
@@ -1,5 +1,5 @@
/*
- * virnumamock.c: Mock some virNuma functions using virsysfs
+ * virnumamock.c: Mock some virNuma functions using sysfs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,10 +24,11 @@
#include "virfile.h"
#include "viralloc.h"
#include "virstring.h"
-#include "virsysfspriv.h"
#define VIR_FROM_THIS VIR_FROM_NONE
+#define SYSFS_SYSTEM_PATH "/sys/devices/system"
+
static int numa_avail = -1;
@@ -42,7 +43,7 @@ virNumaIsAvailable(void)
if (numa_avail < 0) {
char *sysfs_node_path = NULL;
- if (virAsprintfQuiet(&sysfs_node_path, "%s/node",
virSysfsGetSystemPath()) < 0)
+ if (virAsprintfQuiet(&sysfs_node_path, SYSFS_SYSTEM_PATH "/node")
< 0)
return false;
numa_avail = virFileExists(sysfs_node_path);
@@ -68,7 +69,7 @@ virNumaGetMaxNode(void)
int ret = -1;
virBitmapPtr map = NULL;
- if (virSysfsGetValueBitmap("node/online", &map) < 0)
+ if (virFileReadValueBitmap(&map, SYSFS_SYSTEM_PATH "/node/online") <
0)
return -1;
ret = virBitmapLastSetBit(map);
@@ -82,7 +83,7 @@ virNumaNodeIsAvailable(int node)
bool ret = false;
virBitmapPtr map = NULL;
- if (virSysfsGetValueBitmap("node/online", &map) < 0)
+ if (virFileReadValueBitmap(&map, SYSFS_SYSTEM_PATH "/node/online") <
0)
return false;
ret = virBitmapIsBitSet(map, node);
@@ -117,7 +118,7 @@ virNumaGetDistances(int node ATTRIBUTE_UNUSED,
}
/*
- * TODO: Adapt virNumaGetHugePageInfo{Path,Dir} to use virsysfs so that the
+ * TODO: Adapt virNumaGetHugePageInfo{Path,Dir} to use sysfs so that the
* paths can be modified and this function can be thrown away and instead we'd
* have copied info from /sys (as we do with /sys/devices/system).
*/
@@ -177,7 +178,7 @@ virNumaGetNodeCPUs(int node, virBitmapPtr *cpus)
int ret = -1;
char *cpulist = NULL;
- if (virSysfsGetNodeValueString(node, "cpulist", &cpulist) < 0)
+ if (virFileReadValueString(&cpulist, SYSFS_SYSTEM_PATH
"/node/node%u/cpulist", node) < 0)
return -1;
*cpus = virBitmapParseUnlimited(cpulist);
--
2.12.2
2:42 a.m.
New subject: [libvirt] [PATCH v2 05/12] util: Remove virsysfs and instead enhance virFileReadValue* functions
On Wed, Apr 05, 2017 at 04:36:28PM +0200, Martin Kletzander wrote:
It is no longer needed thanks to the great virfilemock.c. And this
way we don't have to add a new set of functions for each prefixed
path.
While on that, add two functions that weren't there before, string and
scaled integer reading ones. Also increase the length of the string
being read by one to accompany for the optional newline at the
end (i.e. change INT_STRLEN_BOUND to INT_BUFSIZE_BOUND).
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/Makefile.am | 2 -
src/conf/capabilities.c | 1 -
src/libvirt_private.syms | 16 +---
src/util/virfile.c | 204 ++++++++++++++++++++++++++++++++++-------
src/util/virfile.h | 14 ++-
src/util/virhostcpu.c | 43 +++++----
src/util/virsysfs.c | 231 -----------------------------------------------
src/util/virsysfs.h | 70 --------------
src/util/virsysfspriv.h | 28 ------
tests/Makefile.am | 5 +-
tests/vircaps2xmltest.c | 6 +-
tests/virhostcputest.c | 8 +-
tests/virnumamock.c | 15 +--
13 files changed, 228 insertions(+), 415 deletions(-)
delete mode 100644 src/util/virsysfs.c
delete mode 100644 src/util/virsysfs.h
delete mode 100644 src/util/virsysfspriv.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 75e4344198c5..f04d262952e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -174,7 +174,6 @@ UTIL_SOURCES = \
util/virstorageencryption.c util/virstorageencryption.h \
util/virstoragefile.c util/virstoragefile.h \
util/virstring.h util/virstring.c \
- util/virsysfs.c util/virsysfs.h util/virsysfspriv.h \
I would split this patch in two, one that introduces the adjustments to
virFile* methods, replacing the virSysfs calls and then another one removing
the virsysfs stuff.
[...]
/**
* virFileReadValueInt:
- * @path: file to read from
* @value: pointer to int to be filled in with the value
+ * @format, ...: file to read from
*
- * Read int from @path and put it into @value.
+ * Read int from @format and put it into @value.
*
* Return -2 for non-existing file, -1 on other errors and 0 if everything went
* fine.
*/
int
-virFileReadValueInt(const char *path, int *value)
+virFileReadValueInt(int *value, const char *format, ...)
I spent a significant amount of time thinking off how this could be done
differently so that everyone likes it (because I don't like passing format
string to a function that in my opinion screams for an argument containing a
path already built...), but haven't come up with anything that everyone would
agree with, so I gave up on that and there's no point in stalling the patch
furthermore and argue about our subjective opinions on the matter (but I just
had to express mine, sorry...).
{
+ int ret = -1;
char *str = NULL;
+ char *path = NULL;
+ va_list ap;
- if (!virFileExists(path))
- return -2;
+ va_start(ap, format);
+ if (virVasprintf(&path, format, ap) < 0) {
+ va_end(ap);
+ goto cleanup;
+ }
+ va_end(ap);
This will relate to the paragraph I wrote above, I know you used ^this bit to
ideally get rid of the 3 lines of code from every caller that needs to read
from a file:
1) declare @path
2) call virAsprintf
3) return -1 on failure of the above
[...]
+
+/* Arbitrarily sized number, feel free to change, but the function should be
+ * used for small, interface-like files, so it should not be huge (subjective) */
+#define VIR_FILE_READ_VALUE_STRING_MAX 4096
either define it on top of the module or define it before the methods that make
use of it, undefining it afterwards (*ScaledInt doesn't use this constant).
+
+/**
+ * virFileReadValueScaledInt:
+ * @value: pointer to unsigned long long int to be filled in with the value
+ * @format, ...: file to read from
+ *
+ * Read unsigned scaled int from @format and put it into @value.
+ *
+ * Return -2 for non-existing file, -1 on other errors and 0 if everything went
+ * fine.
+ */
[...]
- rv = virSysfsGetCpuValueString(cpu,
"topology/thread_siblings", &str);
+ rv = virFileReadValueString(&str,
+ SYSFS_SYSTEM_PATH
+ "/cpu/cpu%u/topology/thread_siblings",
+ cpu);
Could we make the string constant part of the formatting string? Because the
way it looks now signals an alert "oh, there's a missing comma delimiting
arguments".
- if (virAsprintf(&sysfs_nodedir, "%s/node",
virSysfsGetSystemPath()) < 0)
+ if (virAsprintf(&sysfs_nodedir, SYSFS_SYSTEM_PATH "/node") < 0)
Same here, could we preserve the explicit formatting string and pass the
constant as an argument to it?
#define VIR_FROM_THIS VIR_FROM_NONE
@@ -52,7 +52,7 @@ test_virCapabilities(const void *opaque)
abs_srcdir, data->filename) < 0)
goto cleanup;
- virSysfsSetSystemPath(dir);
+ virFileMockAddPrefix("/sys/devices/system", dir);
caps = virCapabilitiesNew(data->arch, data->offlineMigrate,
data->liveMigrate);
if (!caps)
@@ -61,7 +61,7 @@ test_virCapabilities(const void *opaque)
if (virCapabilitiesInitNUMA(caps) < 0)
goto cleanup;
- virSysfsSetSystemPath(NULL);
+ virFileMockClearPrefixes();
RemovePrefix I suppose? It doesn't matter much now, since there's one
occurrence, but from the other change below I figured that we probably want to
remove the one single prefix we just added.
So I had a few nitpicks, but in principle, the patch's fine (even though I will
probably silently disagree with some bits from now on;)), ACK.
Erik
4:36 a.m.
New subject: [libvirt] [PATCH v2 05/12] util: Remove virsysfs and instead enhance virFileReadValue* functions
On Fri, Apr 07, 2017 at 09:42:23AM +0200, Erik Skultety wrote:
On Wed, Apr 05, 2017 at 04:36:28PM +0200, Martin Kletzander wrote:
> It is no longer needed thanks to the great virfilemock.c. And this
> way we don't have to add a new set of functions for each prefixed
> path.
>
> While on that, add two functions that weren't there before, string and
> scaled integer reading ones. Also increase the length of the string
> being read by one to accompany for the optional newline at the
> end (i.e. change INT_STRLEN_BOUND to INT_BUFSIZE_BOUND).
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
> ---
> src/Makefile.am | 2 -
> src/conf/capabilities.c | 1 -
> src/libvirt_private.syms | 16 +---
> src/util/virfile.c | 204 ++++++++++++++++++++++++++++++++++-------
> src/util/virfile.h | 14 ++-
> src/util/virhostcpu.c | 43 +++++----
> src/util/virsysfs.c | 231 -----------------------------------------------
> src/util/virsysfs.h | 70 --------------
> src/util/virsysfspriv.h | 28 ------
> tests/Makefile.am | 5 +-
> tests/vircaps2xmltest.c | 6 +-
> tests/virhostcputest.c | 8 +-
> tests/virnumamock.c | 15 +--
> 13 files changed, 228 insertions(+), 415 deletions(-)
> delete mode 100644 src/util/virsysfs.c
> delete mode 100644 src/util/virsysfs.h
> delete mode 100644 src/util/virsysfspriv.h
>
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 75e4344198c5..f04d262952e8 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -174,7 +174,6 @@ UTIL_SOURCES = \
> util/virstorageencryption.c util/virstorageencryption.h \
> util/virstoragefile.c util/virstoragefile.h \
> util/virstring.h util/virstring.c \
> - util/virsysfs.c util/virsysfs.h util/virsysfspriv.h \
I would split this patch in two, one that introduces the adjustments to
virFile* methods, replacing the virSysfs calls and then another one removing
the virsysfs stuff.
I wanted to do that, but if I change the virFileRead* functions, I have
to change the callers in virsysfs.c, file that I will just remove, just
so that the build doesn't fail between those two commits, and that would
result in pointless changes. I don't see how the removal of that file
interferes with the rest of the changes, just skip the removal hunks.
Or you can limit the files for which you see diffs if you look at the
patch outside of the MUA.
[...]
> /**
> * virFileReadValueInt:
> - * @path: file to read from
> * @value: pointer to int to be filled in with the value
> + * @format, ...: file to read from
> *
> - * Read int from @path and put it into @value.
> + * Read int from @format and put it into @value.
> *
> * Return -2 for non-existing file, -1 on other errors and 0 if everything went
> * fine.
> */
> int
> -virFileReadValueInt(const char *path, int *value)
> +virFileReadValueInt(int *value, const char *format, ...)
I spent a significant amount of time thinking off how this could be done
differently so that everyone likes it (because I don't like passing format
string to a function that in my opinion screams for an argument containing a
path already built...), but haven't come up with anything that everyone would
agree with, so I gave up on that and there's no point in stalling the patch
furthermore and argue about our subjective opinions on the matter (but I just
had to express mine, sorry...).
Sure, as I said, I would welcome any ideas to make stuff better. But I
couldn't come up with any other one either. That's probably caused by
the fact that I see this one as the cleanest, nicest approach we can
have. If you mention what particular parts you don't like, I can at
least try to meet you half-way. Maybe we'll think of something even
better.
> {
> + int ret = -1;
> char *str = NULL;
> + char *path = NULL;
> + va_list ap;
>
> - if (!virFileExists(path))
> - return -2;
> + va_start(ap, format);
> + if (virVasprintf(&path, format, ap) < 0) {
> + va_end(ap);
> + goto cleanup;
> + }
> + va_end(ap);
This will relate to the paragraph I wrote above, I know you used ^this bit to
ideally get rid of the 3 lines of code from every caller that needs to read
from a file:
1) declare @path
2) call virAsprintf
3) return -1 on failure of the above
And cleanup the path *after* the virFileRead* function is called both if
it failed and if it did not fail, making it harder to call multiple
virFileRead* after each other, effectively making you do 3 or 4 more
lines for each call. Those were the lines that were bothering me, way
more than three you mentioned.
[...]
> +
> +/* Arbitrarily sized number, feel free to change, but the function should be
> + * used for small, interface-like files, so it should not be huge (subjective) */
> +#define VIR_FILE_READ_VALUE_STRING_MAX 4096
either define it on top of the module or define it before the methods that make
use of it, undefining it afterwards (*ScaledInt doesn't use this constant).
It should've used the symbol, let me check...
... oh, I see I left INT_BUFSIZE_BOUND(unsigned long long) there, which
Ought to be enough for everyone™, I'll move the define elsewhere.
> +
> +/**
> + * virFileReadValueScaledInt:
> + * @value: pointer to unsigned long long int to be filled in with the value
> + * @format, ...: file to read from
> + *
> + * Read unsigned scaled int from @format and put it into @value.
> + *
> + * Return -2 for non-existing file, -1 on other errors and 0 if everything went
> + * fine.
> + */
[...]
> - rv = virSysfsGetCpuValueString(cpu, "topology/thread_siblings",
&str);
> + rv = virFileReadValueString(&str,
> + SYSFS_SYSTEM_PATH
> + "/cpu/cpu%u/topology/thread_siblings",
> + cpu);
Could we make the string constant part of the formatting string? Because the
way it looks now signals an alert "oh, there's a missing comma delimiting
arguments".
> - if (virAsprintf(&sysfs_nodedir, "%s/node",
virSysfsGetSystemPath()) < 0)
> + if (virAsprintf(&sysfs_nodedir, SYSFS_SYSTEM_PATH "/node") <
0)
Same here, could we preserve the explicit formatting string and pass the
constant as an argument to it?
You mean ("%s/node", SYSFS_SYSTEM_PATH) ? Of course we could. I just
did it this way.
> #define VIR_FROM_THIS VIR_FROM_NONE
> @@ -52,7 +52,7 @@ test_virCapabilities(const void *opaque)
> abs_srcdir, data->filename) < 0)
> goto cleanup;
>
> - virSysfsSetSystemPath(dir);
> + virFileMockAddPrefix("/sys/devices/system", dir);
> caps = virCapabilitiesNew(data->arch, data->offlineMigrate,
data->liveMigrate);
>
> if (!caps)
> @@ -61,7 +61,7 @@ test_virCapabilities(const void *opaque)
> if (virCapabilitiesInitNUMA(caps) < 0)
> goto cleanup;
>
> - virSysfsSetSystemPath(NULL);
> + virFileMockClearPrefixes();
RemovePrefix I suppose? It doesn't matter much now, since there's one
occurrence, but from the other change below I figured that we probably want to
remove the one single prefix we just added.
Actually, following commits will add multiple overrides (well, at least
one) and this way they won't have to remove each one of them explicitly.
It's also more error-proof, e.g. if someone forgets to remove it.
So I had a few nitpicks, but in principle, the patch's fine (even
though I will
probably silently disagree with some bits from now on;)), ACK.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 06/12] tests: Test vircaps2xmldata XMLs in virschematest
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/virschematest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 119d4ba395e2..ffed2175fd37 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -215,7 +215,8 @@ mymain(void)
} \
} while (0)
- DO_TEST_DIR("capability.rng", "capabilityschemadata",
"xencapsdata");
+ DO_TEST_DIR("capability.rng", "capabilityschemadata",
"xencapsdata",
+ "vircaps2xmldata");
DO_TEST_DIR("domain.rng", "domainschemadata",
"qemuargv2xmldata",
"qemuxml2argvdata", "sexpr2xmldata",
"xmconfigdata",
"xml2sexprdata", "qemuxml2xmloutdata",
"lxcxml2xmldata",
--
2.12.2
3:31 a.m.
New subject: [libvirt] [PATCH v2 06/12] tests: Test vircaps2xmldata XMLs in virschematest
On Wed, Apr 05, 2017 at 04:36:29PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/virschematest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/virschematest.c b/tests/virschematest.c
index 119d4ba395e2..ffed2175fd37 100644
--- a/tests/virschematest.c
+++ b/tests/virschematest.c
@@ -215,7 +215,8 @@ mymain(void)
} \
} while (0)
- DO_TEST_DIR("capability.rng", "capabilityschemadata",
"xencapsdata");
+ DO_TEST_DIR("capability.rng", "capabilityschemadata",
"xencapsdata",
+ "vircaps2xmldata");
DO_TEST_DIR("domain.rng", "domainschemadata",
"qemuargv2xmldata",
"qemuxml2argvdata", "sexpr2xmldata",
"xmconfigdata",
"xml2sexprdata", "qemuxml2xmloutdata",
"lxcxml2xmldata",
--
2.12.2
ACK.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 07/12] tests: Add missing cache data for vircaps2xmltest
Commit a0fdd2f6f9a0cc77ae285c289e2c16d314b6a907 added some data from
the system but forgot 3 files for each cache.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id | 1 +
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id | 1 +
.../vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map | 2 +-
tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id | 1 +
80 files changed, 80 insertions(+), 48 deletions(-)
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
create mode 100644 tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
index d41d18ba0096..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
index b4de39476753..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
index d41d18ba0096..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
index b4de39476753..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
index d41d18ba0096..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
index b4de39476753..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
@@ -1 +1 @@
-11
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
index cf141eb99931..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
index 2bd5a0a98a36..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
index cf141eb99931..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
index 2bd5a0a98a36..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
index cf141eb99931..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
@@ -1 +1 @@
-1,5
+0-1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
index 2bd5a0a98a36..75016ea36252 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
@@ -1 +1 @@
-22
+03
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
index 62188ed84ff3..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
index c739b42c4d2c..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
index 62188ed84ff3..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
index c739b42c4d2c..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
index 62188ed84ff3..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
@@ -1 +1 @@
-2,6
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
index c739b42c4d2c..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
@@ -1 +1 @@
-44
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
index 62dcd5976571..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
index d22307c427b8..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
index 62dcd5976571..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
index d22307c427b8..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
index 62dcd5976571..7a9857542a65 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
@@ -1 +1 @@
-3,7
+2-3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
index d22307c427b8..8ac4b4ca54c5 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
@@ -1 +1 @@
-88
+0c
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
index d41d18ba0096..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
index b4de39476753..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
index d41d18ba0096..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
index b4de39476753..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
index d41d18ba0096..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
@@ -1 +1 @@
-0,4
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
index b4de39476753..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
@@ -1 +1 @@
-11
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
index cf141eb99931..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
index 2bd5a0a98a36..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
index cf141eb99931..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
index 2bd5a0a98a36..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
index cf141eb99931..e66d883ade72 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
@@ -1 +1 @@
-1,5
+4-5
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
index 2bd5a0a98a36..64bb6b746dce 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
@@ -1 +1 @@
-22
+30
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
index 62188ed84ff3..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
index c739b42c4d2c..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
index 62188ed84ff3..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
index c739b42c4d2c..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
index 62188ed84ff3..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
@@ -1 +1 @@
-2,6
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
index c739b42c4d2c..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
@@ -1 +1 @@
-44
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
index 62dcd5976571..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
index d22307c427b8..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
index 62dcd5976571..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
index d22307c427b8..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
index 62dcd5976571..fdd9f375177b 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
@@ -1 +1 @@
-3,7
+6-7
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
index d22307c427b8..caecf05cdbb0 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
@@ -1 +1 @@
-88
+c0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
@@ -0,0 +1 @@
+0
--
2.12.2
3:39 a.m.
New subject: [libvirt] [PATCH v2 07/12] tests: Add missing cache data for vircaps2xmltest
diff --git
a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
index d41d18ba0096..8b0fab869c1d 100644
--- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
@@ -1 +1 @@
-0,4
+0-1
Honestly, I have absolutely no idea, how I should check this (same goes for the
rest of the patch). I'm just going to trust you here, say ACK because it builds
and hide in the corner (just in case it's broken somehow).
Erik
4:42 a.m.
New subject: [libvirt] [PATCH v2 07/12] tests: Add missing cache data for vircaps2xmltest
On Fri, Apr 07, 2017 at 10:39:17AM +0200, Erik Skultety wrote:
> diff --git
a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
> new file mode 100644
> index 000000000000..573541ac9702
> --- /dev/null
> +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
> @@ -0,0 +1 @@
> +0
> diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
> index d41d18ba0096..8b0fab869c1d 100644
> --- a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
> +++ b/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
> @@ -1 +1 @@
> -0,4
> +0-1
Honestly, I have absolutely no idea, how I should check this (same goes for the
rest of the patch). I'm just going to trust you here, say ACK because it builds
and hide in the corner (just in case it's broken somehow).
I took it from another machine originally, I haven't realized I'm
changing some of these, but this is what the tests are added for, so
I'll keep this one.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 08/12] Add RNG schema for host cache information in capabilities
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/schemas/capability.rng | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 88e08d299ac9..208095302a63 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -45,6 +45,9 @@
<optional>
<ref name='topology'/>
</optional>
+ <optional>
+ <ref name='cache'/>
+ </optional>
<zeroOrMore>
<ref name='secmodel'/>
</zeroOrMore>
@@ -248,6 +251,37 @@
</element>
</define>
+ <define name='cache'>
+ <element name='cache'>
+ <oneOrMore>
+ <element name='bank'>
+ <attribute name='id'>
+ <ref name='unsignedInt'/>
+ </attribute>
+ <attribute name='level'>
+ <ref name='unsignedInt'/>
+ </attribute>
+ <attribute name='type'>
+ <choice>
+ <value>unified</value>
+ <value>instruction</value>
+ <value>data</value>
+ </choice>
+ </attribute>
+ <attribute name='size'>
+ <ref name='unsignedInt'/>
+ </attribute>
+ <attribute name='unit'>
+ <ref name='unit'/>
+ </attribute>
+ <attribute name='cpus'>
+ <ref name='cpuset'/>
+ </attribute>
+ </element>
+ </oneOrMore>
+ </element>
+ </define>
+
<define name='guestcaps'>
<element name='guest'>
<ref name='ostype'/>
--
2.12.2
7:39 a.m.
New subject: [libvirt] [PATCH v2 08/12] Add RNG schema for host cache information in capabilities
On Wed, Apr 05, 2017 at 04:36:31PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/schemas/capability.rng | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
This should be squashed into 9/12, since that is adding the XML support.
ACK with that.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 09/12] Add host cache information into capabilities
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
I'm adding only info about L3 caches, we can add more later, but for
now that's more than enough.
src/conf/capabilities.c | 200 ++++++++++++++++++++++++
src/conf/capabilities.h | 29 ++++
src/libvirt_private.syms | 1 +
tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 3 +
tests/vircaps2xmltest.c | 3 +-
5 files changed, 235 insertions(+), 1 deletion(-)
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 7ed76e65b1a1..416dd1a34aba 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -31,6 +31,7 @@
#include <unistd.h>
#include "capabilities.h"
+#include "c-ctype.h"
#include "count-one-bits.h"
#include "cpu_conf.h"
#include "domain_conf.h"
@@ -50,6 +51,8 @@
#define VIR_FROM_THIS VIR_FROM_CAPABILITIES
+#define SYSFS_SYSTEM_PATH "/sys/devices/system/"
+
VIR_LOG_INIT("conf.capabilities")
VIR_ENUM_DECL(virCapsHostPMTarget)
@@ -237,6 +240,10 @@ virCapabilitiesDispose(void *object)
virCapabilitiesClearSecModel(&caps->host.secModels[i]);
VIR_FREE(caps->host.secModels);
+ for (i = 0; i < caps->host.ncaches; i++)
+ virCapsHostCacheBankFree(caps->host.caches[i]);
+ VIR_FREE(caps->host.caches);
+
VIR_FREE(caps->host.netprefix);
VIR_FREE(caps->host.pagesSize);
virCPUDefFree(caps->host.cpu);
@@ -860,6 +867,49 @@ virCapabilitiesFormatNUMATopology(virBufferPtr buf,
return 0;
}
+static int
+virCapabilitiesFormatCaches(virBufferPtr buf,
+ size_t ncaches,
+ virCapsHostCacheBankPtr *caches)
+{
+ size_t i = 0;
+
+ if (!ncaches)
+ return 0;
+
+ virBufferAddLit(buf, "<cache>\n");
+ virBufferAdjustIndent(buf, 2);
+
+ for (i = 0; i < ncaches; i++) {
+ virCapsHostCacheBankPtr bank = caches[i];
+ char *cpus_str = virBitmapFormat(bank->cpus);
+ bool kilos = !(bank->size % 1024);
+
+ if (!cpus_str)
+ return -1;
+
+ /*
+ * Let's just *hope* the size is aligned to KiBs so that it does not
+ * bite is back in the future
+ */
+ virBufferAsprintf(buf,
+ "<bank id='%u' level='%u'
type='%s' "
+ "size='%llu' unit='%s'
cpus='%s'/>\n",
+ bank->id, bank->level,
+ virCacheTypeToString(bank->type),
+ bank->size >> (kilos * 10),
+ kilos ? "KiB" : "B",
+ cpus_str);
+
+ VIR_FREE(cpus_str);
+ }
+
+ virBufferAdjustIndent(buf, -2);
+ virBufferAddLit(buf, "</cache>\n");
+
+ return 0;
+}
+
/**
* virCapabilitiesFormatXML:
* @caps: capabilities to format
@@ -956,6 +1006,10 @@ virCapabilitiesFormatXML(virCapsPtr caps)
caps->host.numaCell) < 0)
goto error;
+ if (virCapabilitiesFormatCaches(&buf, caps->host.ncaches,
+ caps->host.caches) < 0)
+ goto error;
+
for (i = 0; i < caps->host.nsecModels; i++) {
virBufferAddLit(&buf, "<secmodel>\n");
virBufferAdjustIndent(&buf, 2);
@@ -1438,3 +1492,149 @@ virCapabilitiesInitPages(virCapsPtr caps)
VIR_FREE(pages_size);
return ret;
}
+
+
+VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
+ "unified",
+ "instruction",
+ "data")
+
+bool
+virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a,
+ virCapsHostCacheBankPtr b)
+{
+ return (a->id == b->id &&
+ a->level == b->level &&
+ a->type == b->type &&
+ a->size == b->size &&
+ virBitmapEqual(a->cpus, b->cpus));
+}
+
+void
+virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr)
+{
+ if (!ptr)
+ return;
+
+ virBitmapFree(ptr->cpus);
+ VIR_FREE(ptr);
+}
+
+int
+virCapabilitiesInitCaches(virCapsPtr caps)
+{
+ size_t i = 0;
+ virBitmapPtr cpus = NULL;
+ ssize_t pos = -1;
+ DIR *dirp = NULL;
+ int ret = -1;
+ char *path = NULL;
+ char *type = NULL;
+ struct dirent *ent = NULL;
+ virCapsHostCacheBankPtr bank = NULL;
+
+ /* Minimum level to expose in capabilities. Can be lowered or removed (with
+ * the appropriate code below), but should not be increased, because we'd
+ * lose information. */
+ const int cache_min_level = 3;
+
+ /* offline CPUs don't provide cache info */
+ if (virFileReadValueBitmap(&cpus, SYSFS_SYSTEM_PATH "cpu/online") <
0)
+ return -1;
+
+ while ((pos = virBitmapNextSetBit(cpus, pos)) >= 0) {
+ int rv = -1;
+
+ VIR_FREE(path);
+ if (virAsprintf(&path, SYSFS_SYSTEM_PATH "cpu/cpu%zd/cache/", pos)
< 0)
+ goto cleanup;
+
+ rv = virDirOpenIfExists(&dirp, path);
+ if (rv < 0)
+ goto cleanup;
+
+ if (!dirp)
+ continue;
+
+ while ((rv = virDirRead(dirp, &ent, path)) > 0) {
+ int tmp_i;
+ char *tmp_c;
+
+ if (!STRPREFIX(ent->d_name, "index"))
+ continue;
+
+ if (VIR_ALLOC(bank) < 0)
+ goto cleanup;
+
+ if (virFileReadValueUint(&bank->id,
+ SYSFS_SYSTEM_PATH
"cpu/cpu%zd/cache/%s/id",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueUint(&bank->level,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/level",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueString(&type,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/type",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueScaledInt(&bank->size,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/size",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueBitmap(&bank->cpus,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/shared_cpu_list",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (bank->level < cache_min_level) {
+ virCapsHostCacheBankFree(bank);
+ bank = NULL;
+ continue;
+ }
+
+ for (tmp_c = type; *tmp_c != '\0'; tmp_c++)
+ *tmp_c = c_tolower(*tmp_c);
+
+ tmp_i = virCacheTypeFromString(type);
+ if (tmp_i < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unknown cache type '%s'"), type);
+ VIR_FREE(type);
+ goto cleanup;
+ }
+ bank->type = tmp_i;
+
+ for (i = 0; i < caps->host.ncaches; i++) {
+ if (virCapsHostCacheBankEquals(bank, caps->host.caches[i]))
+ break;
+ }
+ if (i == caps->host.ncaches) {
+ if (VIR_APPEND_ELEMENT(caps->host.caches,
+ caps->host.ncaches,
+ bank) < 0) {
+ goto cleanup;
+ }
+ }
+
+ virCapsHostCacheBankFree(bank);
+ }
+ if (rv < 0)
+ goto cleanup;
+ }
+
+ ret = 0;
+ cleanup:
+ VIR_FREE(path);
+ virDirClose(&dirp);
+ virCapsHostCacheBankFree(bank);
+ return ret;
+}
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index d10eef3afdea..e099cccf6d39 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -138,6 +138,26 @@ struct _virCapsHostSecModel {
virCapsHostSecModelLabelPtr labels;
};
+typedef enum {
+ VIR_CACHE_TYPE_DATA,
+ VIR_CACHE_TYPE_INSTRUCTION,
+ VIR_CACHE_TYPE_UNIFIED,
+
+ VIR_CACHE_TYPE_LAST
+} virCacheType;
+
+VIR_ENUM_DECL(virCache);
+
+typedef struct _virCapsHostCacheBank virCapsHostCacheBank;
+typedef virCapsHostCacheBank *virCapsHostCacheBankPtr;
+struct _virCapsHostCacheBank {
+ unsigned int id;
+ unsigned int level; /* 1=L1, 2=L2, 3=L3, etc. */
+ unsigned long long size; /* B */
+ virCacheType type; /* Data, Instruction or Unified */
+ virBitmapPtr cpus; /* All CPUs that share this bank */
+};
+
typedef struct _virCapsHost virCapsHost;
typedef virCapsHost *virCapsHostPtr;
struct _virCapsHost {
@@ -157,6 +177,9 @@ struct _virCapsHost {
size_t nnumaCell_max;
virCapsHostNUMACellPtr *numaCell;
+ size_t ncaches;
+ virCapsHostCacheBankPtr *caches;
+
size_t nsecModels;
virCapsHostSecModelPtr secModels;
@@ -303,4 +326,10 @@ int virCapabilitiesInitPages(virCapsPtr caps);
int virCapabilitiesInitNUMA(virCapsPtr caps);
+bool virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a,
+ virCapsHostCacheBankPtr b);
+void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr);
+
+int virCapabilitiesInitCaches(virCapsPtr caps);
+
#endif /* __VIR_CAPABILITIES_H */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d399e0dc063a..b175b3b02901 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -59,6 +59,7 @@ virCapabilitiesFreeNUMAInfo;
virCapabilitiesGetCpusForNodemask;
virCapabilitiesGetNodeInfo;
virCapabilitiesHostSecModelAddBaseLabel;
+virCapabilitiesInitCaches;
virCapabilitiesInitNUMA;
virCapabilitiesInitPages;
virCapabilitiesNew;
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
index 88f2ec62277e..f2da28e576ac 100644
--- a/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-caches.xml
@@ -28,6 +28,9 @@
</cell>
</cells>
</topology>
+ <cache>
+ <bank id='0' level='3' type='unified'
size='8192' unit='KiB' cpus='0-7'/>
+ </cache>
</host>
</capabilities>
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index af422238520b..8f02314afe8e 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -58,7 +58,8 @@ test_virCapabilities(const void *opaque)
if (!caps)
goto cleanup;
- if (virCapabilitiesInitNUMA(caps) < 0)
+ if (virCapabilitiesInitNUMA(caps) < 0 ||
+ virCapabilitiesInitCaches(caps) < 0)
goto cleanup;
virFileMockClearPrefixes();
--
2.12.2
1:04 a.m.
New subject: [libvirt] [PATCH v2 09/12] Add host cache information into capabilities
+
+VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
+ "unified",
+ "instruction",
+ "data")
+
};
+typedef enum {
+ VIR_CACHE_TYPE_DATA,
+ VIR_CACHE_TYPE_INSTRUCTION,
+ VIR_CACHE_TYPE_UNIFIED,
+
+ VIR_CACHE_TYPE_LAST
+} virCacheType;
+
The sequence is wrong, it should be :
VIR_CACHE_TYPE_UNIFIED,
VIR_CACHE_TYPE_INSTRUCTION,
VIR_CACHE_TYPE_DATA,
see the above VIR_ENUM_IMPL.
+VIR_ENUM_DECL(virCache);
+
+typedef struct _virCapsHostCacheBank virCapsHostCacheBank;
4:10 a.m.
New subject: [libvirt] [PATCH v2 09/12] Add host cache information into capabilities
On Thu, Apr 06, 2017 at 02:04:04PM +0800, Eli Qiao wrote:
> +
> +VIR_ENUM_IMPL(virCache, VIR_CACHE_TYPE_LAST,
> + "unified",
> + "instruction",
> + "data")
> +
> };
>
> +typedef enum {
> + VIR_CACHE_TYPE_DATA,
> + VIR_CACHE_TYPE_INSTRUCTION,
> + VIR_CACHE_TYPE_UNIFIED,
> +
> + VIR_CACHE_TYPE_LAST
> +} virCacheType;
> +
The sequence is wrong, it should be :
VIR_CACHE_TYPE_UNIFIED,
VIR_CACHE_TYPE_INSTRUCTION,
VIR_CACHE_TYPE_DATA,
Hehe, good catch. Since the internal values are not exposed anywhere,
the test data aren't affected. I wish I remembered why I changed that.
For future reviewers, consider the following squashed in:
diff --git i/src/conf/capabilities.h w/src/conf/capabilities.h
index e099cccf6d39..60c8218ce3e5 100644
--- i/src/conf/capabilities.h
+++ w/src/conf/capabilities.h
@@ -139,9 +139,9 @@ struct _virCapsHostSecModel {
};
typedef enum {
- VIR_CACHE_TYPE_DATA,
- VIR_CACHE_TYPE_INSTRUCTION,
VIR_CACHE_TYPE_UNIFIED,
+ VIR_CACHE_TYPE_INSTRUCTION,
+ VIR_CACHE_TYPE_DATA,
VIR_CACHE_TYPE_LAST
} virCacheType;
--
Martin
7:35 a.m.
New subject: [libvirt] [PATCH v2 09/12] Add host cache information into capabilities
On Wed, Apr 05, 2017 at 04:36:32PM +0200, Martin Kletzander wrote:
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
I'm adding only info about L3 caches, we can add more later, but for
now that's more than enough.
I think it's worth putting this into the commit message, along with a snippet
introducing the XML update.
[...]
+static int
+virCapabilitiesFormatCaches(virBufferPtr buf,
+ size_t ncaches,
+ virCapsHostCacheBankPtr *caches)
+{
+ size_t i = 0;
+
+ if (!ncaches)
+ return 0;
+
+ virBufferAddLit(buf, "<cache>\n");
+ virBufferAdjustIndent(buf, 2);
+
+ for (i = 0; i < ncaches; i++) {
+ virCapsHostCacheBankPtr bank = caches[i];
+ char *cpus_str = virBitmapFormat(bank->cpus);
+ bool kilos = !(bank->size % 1024);
I'd suggest kibs/kibis/kibi but not kilos.
+
+int
+virCapabilitiesInitCaches(virCapsPtr caps)
+{
+ size_t i = 0;
+ virBitmapPtr cpus = NULL;
+ ssize_t pos = -1;
+ DIR *dirp = NULL;
+ int ret = -1;
+ char *path = NULL;
+ char *type = NULL;
+ struct dirent *ent = NULL;
+ virCapsHostCacheBankPtr bank = NULL;
+
+ /* Minimum level to expose in capabilities. Can be lowered or removed (with
+ * the appropriate code below), but should not be increased, because we'd
+ * lose information. */
+ const int cache_min_level = 3;
+
+ /* offline CPUs don't provide cache info */
+ if (virFileReadValueBitmap(&cpus, SYSFS_SYSTEM_PATH "cpu/online") <
0)
+ return -1;
+
+ while ((pos = virBitmapNextSetBit(cpus, pos)) >= 0) {
+ int rv = -1;
+
+ VIR_FREE(path);
+ if (virAsprintf(&path, SYSFS_SYSTEM_PATH "cpu/cpu%zd/cache/", pos)
< 0)
+ goto cleanup;
+
+ rv = virDirOpenIfExists(&dirp, path);
+ if (rv < 0)
+ goto cleanup;
+
+ if (!dirp)
+ continue;
+
+ while ((rv = virDirRead(dirp, &ent, path)) > 0) {
+ int tmp_i;
+ char *tmp_c;
+
+ if (!STRPREFIX(ent->d_name, "index"))
+ continue;
+
+ if (VIR_ALLOC(bank) < 0)
+ goto cleanup;
+
+ if (virFileReadValueUint(&bank->id,
+ SYSFS_SYSTEM_PATH
"cpu/cpu%zd/cache/%s/id",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueUint(&bank->level,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/level",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueString(&type,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/type",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueScaledInt(&bank->size,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/size",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (virFileReadValueBitmap(&bank->cpus,
+ SYSFS_SYSTEM_PATH
+ "cpu/cpu%zd/cache/%s/shared_cpu_list",
+ pos, ent->d_name) < 0)
+ goto cleanup;
+
+ if (bank->level < cache_min_level) {
+ virCapsHostCacheBankFree(bank);
+ bank = NULL;
+ continue;
+ }
I'd say, make the bank->level read first, then perform ^this check and then
continue with the rest of the checks...you know, to save a few cycles...
+
+ for (tmp_c = type; *tmp_c != '\0'; tmp_c++)
+ *tmp_c = c_tolower(*tmp_c);
+
+ tmp_i = virCacheTypeFromString(type);
+ if (tmp_i < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Unknown cache type '%s'"), type);
+ VIR_FREE(type);
+ goto cleanup;
+ }
I'd maybe add a small static function handling ^this hunk (or add a symmetric
virStringToLower method), but that's a bikeshed for another day.
+ bank->type = tmp_i;
+
+ for (i = 0; i < caps->host.ncaches; i++) {
+ if (virCapsHostCacheBankEquals(bank, caps->host.caches[i]))
+ break;
+ }
+ if (i == caps->host.ncaches) {
+ if (VIR_APPEND_ELEMENT(caps->host.caches,
+ caps->host.ncaches,
+ bank) < 0) {
+ goto cleanup;
+ }
+ }
I'd wrap ^this here as well, a small boolean (possibly inline) method called
virCapsHostCacheBankExists, if you get false, then add it to the list, but feel
free to disagree with me on this.
ACK if you enhance the commit message.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 10/12] Init host cache info in drivers
Added only in drivers that were already calling
virCapabilitiesInitNUMA(). Instead of refactoring all the callers to
behave the same way in case of error, just follow what the callers are
doing for all the functions.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/lxc/lxc_conf.c | 3 +++
src/openvz/openvz_conf.c | 3 +++
src/phyp/phyp_driver.c | 3 +++
src/qemu/qemu_capabilities.c | 3 +++
src/uml/uml_conf.c | 3 +++
src/vbox/vbox_common.c | 3 +++
src/vmware/vmware_conf.c | 3 +++
src/vz/vz_driver.c | 2 ++
8 files changed, 23 insertions(+)
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index e47b667f582a..508b98ba21b3 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -81,6 +81,9 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver)
VIR_WARN("Failed to query host NUMA topology, disabling NUMA
capabilities");
}
+ if (virCapabilitiesInitCaches(caps) < 0)
+ VIR_WARN("Failed to get host CPU cache info");
+
/* Only probe for power management capabilities in the driver,
* not in the emulator */
if (driver && virNodeSuspendGetTargetMask(&caps->host.powerMgmt) <
0)
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 196fefb8de19..23a02d749e8b 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -168,6 +168,9 @@ virCapsPtr openvzCapsInit(void)
if (virCapabilitiesInitNUMA(caps) < 0)
goto no_memory;
+ if (virCapabilitiesInitCaches(caps) < 0)
+ goto no_memory;
+
if ((guest = virCapabilitiesAddGuest(caps,
VIR_DOMAIN_OSTYPE_EXE,
caps->host.arch,
diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 2123784f70da..0cc288f36d8e 100644
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -340,6 +340,9 @@ phypCapsInit(void)
("Failed to query host NUMA topology, disabling NUMA
capabilities");
}
+ if (virCapabilitiesInitCaches(caps) < 0)
+ VIR_WARN("Failed to get host CPU cache info");
+
if ((guest = virCapabilitiesAddGuest(caps,
VIR_DOMAIN_OSTYPE_LINUX,
caps->host.arch,
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a2f4f43e65bf..1a3072a5c834 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1109,6 +1109,9 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
VIR_WARN("Failed to query host NUMA topology, disabling NUMA
capabilities");
}
+ if (virCapabilitiesInitCaches(caps) < 0)
+ VIR_WARN("Failed to get host CPU cache info");
+
if (!(caps->host.cpu = virCPUProbeHost(caps->host.arch)))
VIR_WARN("Failed to get host CPU");
diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 871653c5a64c..2be849a6c160 100644
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -69,6 +69,9 @@ virCapsPtr umlCapsInit(void)
VIR_WARN("Failed to query host NUMA topology, disabling NUMA
capabilities");
}
+ if (virCapabilitiesInitCaches(caps) < 0)
+ VIR_WARN("Failed to get host CPU cache info");
+
if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0)
VIR_WARN("Failed to get host power management capabilities");
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index d2b36ac0dfed..d6d363e456a7 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -79,6 +79,9 @@ vboxCapsInit(void)
if (virCapabilitiesInitNUMA(caps) < 0)
goto no_memory;
+ if (virCapabilitiesInitCaches(caps) < 0)
+ goto no_memory;
+
if ((guest = virCapabilitiesAddGuest(caps,
VIR_DOMAIN_OSTYPE_HVM,
caps->host.arch,
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index bf4597c4748a..891d9a47f0b4 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -68,6 +68,9 @@ vmwareCapsInit(void)
if (virCapabilitiesInitNUMA(caps) < 0)
goto error;
+ if (virCapabilitiesInitCaches(caps) < 0)
+ goto error;
+
/* i686 guests are always supported */
if ((guest = virCapabilitiesAddGuest(caps,
VIR_DOMAIN_OSTYPE_HVM,
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index da83a8ff5ca7..b567c0a56a8f 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -118,6 +118,8 @@ vzBuildCapabilities(void)
if (virCapabilitiesInitNUMA(caps) < 0)
goto error;
+ if (virCapabilitiesInitCaches(caps) < 0)
+ goto error;
verify(ARRAY_CARDINALITY(archs) == ARRAY_CARDINALITY(emulators));
--
2.12.2
7:37 a.m.
New subject: [libvirt] [PATCH v2 10/12] Init host cache info in drivers
On Wed, Apr 05, 2017 at 04:36:33PM +0200, Martin Kletzander wrote:
Added only in drivers that were already calling
virCapabilitiesInitNUMA(). Instead of refactoring all the callers to
behave the same way in case of error, just follow what the callers are
doing for all the functions.
ACK.
Erik
9:36 a.m.
New subject: [libvirt] [PATCH v2 11/12] tests: Add support for more complicated hierarchies in vircaps2xmltest
More directories will need to be mocked, so let's prepare for that.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/vircaps2xmltest.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 8f02314afe8e..31d027979cab 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -35,6 +35,7 @@ struct virCapabilitiesData {
virArch arch;
bool offlineMigrate;
bool liveMigrate;
+ bool resctrl; /* Whether both resctrl and system sysfs are used */
};
static int
@@ -48,8 +49,13 @@ test_virCapabilities(const void *opaque)
char *dir = NULL;
int ret = -1;
- if (virAsprintf(&dir, "%s/vircaps2xmldata/linux-%s",
- abs_srcdir, data->filename) < 0)
+ /*
+ * We want to keep our directory structure clean, so if there's both resctrl
+ * and system used, we need to use slightly different path; a subdir.
+ */
+ if (virAsprintf(&dir, "%s/vircaps2xmldata/linux-%s%s",
+ abs_srcdir, data->filename,
+ data->resctrl ? "/system" : "") < 0)
goto cleanup;
virFileMockAddPrefix("/sys/devices/system", dir);
@@ -89,19 +95,19 @@ mymain(void)
{
int ret = 0;
-#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate) \
+#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate, resctrl) \
do { \
struct virCapabilitiesData data = {filename, arch, \
offlineMigrate, \
- liveMigrate}; \
+ liveMigrate, resctrl}; \
if (virTestRun(filename, test_virCapabilities, &data) < 0) \
ret = -1; \
} while (0)
-#define DO_TEST(filename, arch) DO_TEST_FULL(filename, arch, true, true)
+#define DO_TEST(filename, arch) DO_TEST_FULL(filename, arch, true, true, false)
- DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
- DO_TEST_FULL("basic", VIR_ARCH_AARCH64, 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);
--
2.12.2
9:36 a.m.
New subject: [libvirt] [PATCH v2 12/12] tests: Add resctrl test for vircaps2xmltest
Add info from yet another machine, this time with resctrl data so that
we can extend tests easily in a test-driven way.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 +
.../linux-resctrl/resctrl/info/L3/cbm_mask | 1 +
.../linux-resctrl/resctrl/info/L3/min_cbm_bits | 1 +
.../linux-resctrl/resctrl/info/L3/num_closids | 1 +
.../linux-resctrl/resctrl/manualres/cpus | 1 +
.../linux-resctrl/resctrl/manualres/schemata | 1 +
.../linux-resctrl/resctrl/manualres/tasks | 0
.../vircaps2xmldata/linux-resctrl/resctrl/schemata | 1 +
tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0
.../linux-resctrl/system/cpu/cpu0/cache/index0/id | 1 +
.../system/cpu/cpu0/cache/index0/level | 1 +
.../system/cpu/cpu0/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index0/size | 1 +
.../system/cpu/cpu0/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index1/id | 1 +
.../system/cpu/cpu0/cache/index1/level | 1 +
.../system/cpu/cpu0/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index1/size | 1 +
.../system/cpu/cpu0/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index2/id | 1 +
.../system/cpu/cpu0/cache/index2/level | 1 +
.../system/cpu/cpu0/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index2/size | 1 +
.../system/cpu/cpu0/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu0/cache/index3/id | 1 +
.../system/cpu/cpu0/cache/index3/level | 1 +
.../system/cpu/cpu0/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu0/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu0/cache/index3/size | 1 +
.../system/cpu/cpu0/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu0/online | 1 +
.../linux-resctrl/system/cpu/cpu0/topology/core_id | 1 +
.../system/cpu/cpu0/topology/core_siblings | 1 +
.../system/cpu/cpu0/topology/core_siblings_list | 1 +
.../system/cpu/cpu0/topology/physical_package_id | 1 +
.../system/cpu/cpu0/topology/thread_siblings | 1 +
.../system/cpu/cpu0/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index0/id | 1 +
.../system/cpu/cpu1/cache/index0/level | 1 +
.../system/cpu/cpu1/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index0/size | 1 +
.../system/cpu/cpu1/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index1/id | 1 +
.../system/cpu/cpu1/cache/index1/level | 1 +
.../system/cpu/cpu1/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index1/size | 1 +
.../system/cpu/cpu1/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index2/id | 1 +
.../system/cpu/cpu1/cache/index2/level | 1 +
.../system/cpu/cpu1/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index2/size | 1 +
.../system/cpu/cpu1/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu1/cache/index3/id | 1 +
.../system/cpu/cpu1/cache/index3/level | 1 +
.../system/cpu/cpu1/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu1/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu1/cache/index3/size | 1 +
.../system/cpu/cpu1/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu1/online | 1 +
.../linux-resctrl/system/cpu/cpu1/topology/core_id | 1 +
.../system/cpu/cpu1/topology/core_siblings | 1 +
.../system/cpu/cpu1/topology/core_siblings_list | 1 +
.../system/cpu/cpu1/topology/physical_package_id | 1 +
.../system/cpu/cpu1/topology/thread_siblings | 1 +
.../system/cpu/cpu1/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index0/id | 1 +
.../system/cpu/cpu10/cache/index0/level | 1 +
.../system/cpu/cpu10/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index0/size | 1 +
.../system/cpu/cpu10/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index1/id | 1 +
.../system/cpu/cpu10/cache/index1/level | 1 +
.../system/cpu/cpu10/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index1/size | 1 +
.../system/cpu/cpu10/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index2/id | 1 +
.../system/cpu/cpu10/cache/index2/level | 1 +
.../system/cpu/cpu10/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index2/size | 1 +
.../system/cpu/cpu10/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu10/cache/index3/id | 1 +
.../system/cpu/cpu10/cache/index3/level | 1 +
.../system/cpu/cpu10/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu10/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu10/cache/index3/size | 1 +
.../system/cpu/cpu10/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu10/online | 1 +
.../system/cpu/cpu10/topology/core_id | 1 +
.../system/cpu/cpu10/topology/core_siblings | 1 +
.../system/cpu/cpu10/topology/core_siblings_list | 1 +
.../system/cpu/cpu10/topology/physical_package_id | 1 +
.../system/cpu/cpu10/topology/thread_siblings | 1 +
.../system/cpu/cpu10/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index0/id | 1 +
.../system/cpu/cpu11/cache/index0/level | 1 +
.../system/cpu/cpu11/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu11/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index0/size | 1 +
.../system/cpu/cpu11/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index1/id | 1 +
.../system/cpu/cpu11/cache/index1/level | 1 +
.../system/cpu/cpu11/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu11/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index1/size | 1 +
.../system/cpu/cpu11/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index2/id | 1 +
.../system/cpu/cpu11/cache/index2/level | 1 +
.../system/cpu/cpu11/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu11/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index2/size | 1 +
.../system/cpu/cpu11/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu11/cache/index3/id | 1 +
.../system/cpu/cpu11/cache/index3/level | 1 +
.../system/cpu/cpu11/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu11/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu11/cache/index3/size | 1 +
.../system/cpu/cpu11/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu11/online | 1 +
.../system/cpu/cpu11/topology/core_id | 1 +
.../system/cpu/cpu11/topology/core_siblings | 1 +
.../system/cpu/cpu11/topology/core_siblings_list | 1 +
.../system/cpu/cpu11/topology/physical_package_id | 1 +
.../system/cpu/cpu11/topology/thread_siblings | 1 +
.../system/cpu/cpu11/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index0/id | 1 +
.../system/cpu/cpu2/cache/index0/level | 1 +
.../system/cpu/cpu2/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index0/size | 1 +
.../system/cpu/cpu2/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index1/id | 1 +
.../system/cpu/cpu2/cache/index1/level | 1 +
.../system/cpu/cpu2/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index1/size | 1 +
.../system/cpu/cpu2/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index2/id | 1 +
.../system/cpu/cpu2/cache/index2/level | 1 +
.../system/cpu/cpu2/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index2/size | 1 +
.../system/cpu/cpu2/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu2/cache/index3/id | 1 +
.../system/cpu/cpu2/cache/index3/level | 1 +
.../system/cpu/cpu2/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu2/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu2/cache/index3/size | 1 +
.../system/cpu/cpu2/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu2/online | 1 +
.../linux-resctrl/system/cpu/cpu2/topology/core_id | 1 +
.../system/cpu/cpu2/topology/core_siblings | 1 +
.../system/cpu/cpu2/topology/core_siblings_list | 1 +
.../system/cpu/cpu2/topology/physical_package_id | 1 +
.../system/cpu/cpu2/topology/thread_siblings | 1 +
.../system/cpu/cpu2/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index0/id | 1 +
.../system/cpu/cpu3/cache/index0/level | 1 +
.../system/cpu/cpu3/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index0/size | 1 +
.../system/cpu/cpu3/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index1/id | 1 +
.../system/cpu/cpu3/cache/index1/level | 1 +
.../system/cpu/cpu3/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index1/size | 1 +
.../system/cpu/cpu3/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index2/id | 1 +
.../system/cpu/cpu3/cache/index2/level | 1 +
.../system/cpu/cpu3/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index2/size | 1 +
.../system/cpu/cpu3/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu3/cache/index3/id | 1 +
.../system/cpu/cpu3/cache/index3/level | 1 +
.../system/cpu/cpu3/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu3/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu3/cache/index3/size | 1 +
.../system/cpu/cpu3/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu3/online | 1 +
.../linux-resctrl/system/cpu/cpu3/topology/core_id | 1 +
.../system/cpu/cpu3/topology/core_siblings | 1 +
.../system/cpu/cpu3/topology/core_siblings_list | 1 +
.../system/cpu/cpu3/topology/physical_package_id | 1 +
.../system/cpu/cpu3/topology/thread_siblings | 1 +
.../system/cpu/cpu3/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index0/id | 1 +
.../system/cpu/cpu4/cache/index0/level | 1 +
.../system/cpu/cpu4/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index0/size | 1 +
.../system/cpu/cpu4/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index1/id | 1 +
.../system/cpu/cpu4/cache/index1/level | 1 +
.../system/cpu/cpu4/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index1/size | 1 +
.../system/cpu/cpu4/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index2/id | 1 +
.../system/cpu/cpu4/cache/index2/level | 1 +
.../system/cpu/cpu4/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index2/size | 1 +
.../system/cpu/cpu4/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu4/cache/index3/id | 1 +
.../system/cpu/cpu4/cache/index3/level | 1 +
.../system/cpu/cpu4/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu4/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu4/cache/index3/size | 1 +
.../system/cpu/cpu4/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu4/online | 1 +
.../linux-resctrl/system/cpu/cpu4/topology/core_id | 1 +
.../system/cpu/cpu4/topology/core_siblings | 1 +
.../system/cpu/cpu4/topology/core_siblings_list | 1 +
.../system/cpu/cpu4/topology/physical_package_id | 1 +
.../system/cpu/cpu4/topology/thread_siblings | 1 +
.../system/cpu/cpu4/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index0/id | 1 +
.../system/cpu/cpu5/cache/index0/level | 1 +
.../system/cpu/cpu5/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index0/size | 1 +
.../system/cpu/cpu5/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index1/id | 1 +
.../system/cpu/cpu5/cache/index1/level | 1 +
.../system/cpu/cpu5/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index1/size | 1 +
.../system/cpu/cpu5/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index2/id | 1 +
.../system/cpu/cpu5/cache/index2/level | 1 +
.../system/cpu/cpu5/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index2/size | 1 +
.../system/cpu/cpu5/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu5/cache/index3/id | 1 +
.../system/cpu/cpu5/cache/index3/level | 1 +
.../system/cpu/cpu5/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu5/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu5/cache/index3/size | 1 +
.../system/cpu/cpu5/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu5/online | 1 +
.../linux-resctrl/system/cpu/cpu5/topology/core_id | 1 +
.../system/cpu/cpu5/topology/core_siblings | 1 +
.../system/cpu/cpu5/topology/core_siblings_list | 1 +
.../system/cpu/cpu5/topology/physical_package_id | 1 +
.../system/cpu/cpu5/topology/thread_siblings | 1 +
.../system/cpu/cpu5/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index0/id | 1 +
.../system/cpu/cpu6/cache/index0/level | 1 +
.../system/cpu/cpu6/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index0/size | 1 +
.../system/cpu/cpu6/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index1/id | 1 +
.../system/cpu/cpu6/cache/index1/level | 1 +
.../system/cpu/cpu6/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index1/size | 1 +
.../system/cpu/cpu6/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index2/id | 1 +
.../system/cpu/cpu6/cache/index2/level | 1 +
.../system/cpu/cpu6/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index2/size | 1 +
.../system/cpu/cpu6/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu6/cache/index3/id | 1 +
.../system/cpu/cpu6/cache/index3/level | 1 +
.../system/cpu/cpu6/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu6/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu6/cache/index3/size | 1 +
.../system/cpu/cpu6/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu6/online | 1 +
.../linux-resctrl/system/cpu/cpu6/topology/core_id | 1 +
.../system/cpu/cpu6/topology/core_siblings | 1 +
.../system/cpu/cpu6/topology/core_siblings_list | 1 +
.../system/cpu/cpu6/topology/physical_package_id | 1 +
.../system/cpu/cpu6/topology/thread_siblings | 1 +
.../system/cpu/cpu6/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index0/id | 1 +
.../system/cpu/cpu7/cache/index0/level | 1 +
.../system/cpu/cpu7/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index0/size | 1 +
.../system/cpu/cpu7/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index1/id | 1 +
.../system/cpu/cpu7/cache/index1/level | 1 +
.../system/cpu/cpu7/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index1/size | 1 +
.../system/cpu/cpu7/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index2/id | 1 +
.../system/cpu/cpu7/cache/index2/level | 1 +
.../system/cpu/cpu7/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index2/size | 1 +
.../system/cpu/cpu7/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu7/cache/index3/id | 1 +
.../system/cpu/cpu7/cache/index3/level | 1 +
.../system/cpu/cpu7/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu7/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu7/cache/index3/size | 1 +
.../system/cpu/cpu7/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu7/online | 1 +
.../linux-resctrl/system/cpu/cpu7/topology/core_id | 1 +
.../system/cpu/cpu7/topology/core_siblings | 1 +
.../system/cpu/cpu7/topology/core_siblings_list | 1 +
.../system/cpu/cpu7/topology/physical_package_id | 1 +
.../system/cpu/cpu7/topology/thread_siblings | 1 +
.../system/cpu/cpu7/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index0/id | 1 +
.../system/cpu/cpu8/cache/index0/level | 1 +
.../system/cpu/cpu8/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index0/size | 1 +
.../system/cpu/cpu8/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index1/id | 1 +
.../system/cpu/cpu8/cache/index1/level | 1 +
.../system/cpu/cpu8/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index1/size | 1 +
.../system/cpu/cpu8/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index2/id | 1 +
.../system/cpu/cpu8/cache/index2/level | 1 +
.../system/cpu/cpu8/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index2/size | 1 +
.../system/cpu/cpu8/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu8/cache/index3/id | 1 +
.../system/cpu/cpu8/cache/index3/level | 1 +
.../system/cpu/cpu8/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu8/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu8/cache/index3/size | 1 +
.../system/cpu/cpu8/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu8/online | 1 +
.../linux-resctrl/system/cpu/cpu8/topology/core_id | 1 +
.../system/cpu/cpu8/topology/core_siblings | 1 +
.../system/cpu/cpu8/topology/core_siblings_list | 1 +
.../system/cpu/cpu8/topology/physical_package_id | 1 +
.../system/cpu/cpu8/topology/thread_siblings | 1 +
.../system/cpu/cpu8/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/cpu9/cache/index0/id | 1 +
.../system/cpu/cpu9/cache/index0/level | 1 +
.../system/cpu/cpu9/cache/index0/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index0/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index0/size | 1 +
.../system/cpu/cpu9/cache/index0/type | 1 +
.../linux-resctrl/system/cpu/cpu9/cache/index1/id | 1 +
.../system/cpu/cpu9/cache/index1/level | 1 +
.../system/cpu/cpu9/cache/index1/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index1/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index1/size | 1 +
.../system/cpu/cpu9/cache/index1/type | 1 +
.../linux-resctrl/system/cpu/cpu9/cache/index2/id | 1 +
.../system/cpu/cpu9/cache/index2/level | 1 +
.../system/cpu/cpu9/cache/index2/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index2/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index2/size | 1 +
.../system/cpu/cpu9/cache/index2/type | 1 +
.../linux-resctrl/system/cpu/cpu9/cache/index3/id | 1 +
.../system/cpu/cpu9/cache/index3/level | 1 +
.../system/cpu/cpu9/cache/index3/shared_cpu_list | 1 +
.../system/cpu/cpu9/cache/index3/shared_cpu_map | 1 +
.../system/cpu/cpu9/cache/index3/size | 1 +
.../system/cpu/cpu9/cache/index3/type | 1 +
.../linux-resctrl/system/cpu/cpu9/online | 1 +
.../linux-resctrl/system/cpu/cpu9/topology/core_id | 1 +
.../system/cpu/cpu9/topology/core_siblings | 1 +
.../system/cpu/cpu9/topology/core_siblings_list | 1 +
.../system/cpu/cpu9/topology/physical_package_id | 1 +
.../system/cpu/cpu9/topology/thread_siblings | 1 +
.../system/cpu/cpu9/topology/thread_siblings_list | 1 +
.../linux-resctrl/system/cpu/online | 1 +
.../linux-resctrl/system/cpu/present | 1 +
.../linux-resctrl/system/node/node0/cpu0 | 1 +
.../linux-resctrl/system/node/node0/cpu1 | 1 +
.../linux-resctrl/system/node/node0/cpu2 | 1 +
.../linux-resctrl/system/node/node0/cpu3 | 1 +
.../linux-resctrl/system/node/node0/cpu4 | 1 +
.../linux-resctrl/system/node/node0/cpu5 | 1 +
.../linux-resctrl/system/node/node0/cpulist | 1 +
.../linux-resctrl/system/node/node0/cpumap | 1 +
.../linux-resctrl/system/node/node0/distance | 1 +
.../hugepages/hugepages-1048576kB/free_hugepages | 1 +
.../hugepages/hugepages-1048576kB/nr_hugepages | 1 +
.../hugepages-1048576kB/surplus_hugepages | 1 +
.../hugepages/hugepages-2048kB/free_hugepages | 1 +
.../node0/hugepages/hugepages-2048kB/nr_hugepages | 1 +
.../hugepages/hugepages-2048kB/surplus_hugepages | 1 +
.../linux-resctrl/system/node/node1/cpu10 | 1 +
.../linux-resctrl/system/node/node1/cpu11 | 1 +
.../linux-resctrl/system/node/node1/cpu6 | 1 +
.../linux-resctrl/system/node/node1/cpu7 | 1 +
.../linux-resctrl/system/node/node1/cpu8 | 1 +
.../linux-resctrl/system/node/node1/cpu9 | 1 +
.../linux-resctrl/system/node/node1/cpulist | 1 +
.../linux-resctrl/system/node/node1/cpumap | 1 +
.../linux-resctrl/system/node/node1/distance | 1 +
.../hugepages/hugepages-1048576kB/free_hugepages | 1 +
.../hugepages/hugepages-1048576kB/nr_hugepages | 1 +
.../hugepages-1048576kB/surplus_hugepages | 1 +
.../hugepages/hugepages-2048kB/free_hugepages | 1 +
.../node1/hugepages/hugepages-2048kB/nr_hugepages | 1 +
.../hugepages/hugepages-2048kB/surplus_hugepages | 1 +
.../linux-resctrl/system/node/online | 1 +
tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 49 ++++++++++++++++++++++
tests/vircaps2xmltest.c | 2 +
416 files changed, 463 insertions(+)
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/tasks
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/present
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8
create mode 120000 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
create mode 100644
tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
create mode 100644 tests/vircaps2xmldata/linux-resctrl/system/node/online
create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
b/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
new file mode 100644
index 000000000000..98d03acc98ed
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
@@ -0,0 +1 @@
+fff
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask
b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask
new file mode 100644
index 000000000000..78031dae83bf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/cbm_mask
@@ -0,0 +1 @@
+fffff
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits
b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/min_cbm_bits
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids
b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3/num_closids
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus
b/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus
new file mode 100644
index 000000000000..8f087a34c80c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/cpus
@@ -0,0 +1 @@
+000
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata
b/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata
new file mode 100644
index 000000000000..e499ef75baaf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/schemata
@@ -0,0 +1 @@
+L3:0=e0000;1=e0000
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/tasks
b/tests/vircaps2xmldata/linux-resctrl/resctrl/manualres/tasks
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
new file mode 100644
index 000000000000..9b47d25fc72e
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
@@ -0,0 +1 @@
+L3:0=1ffff;1=1ffff
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
b/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..5325a8dff751
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+001
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..5325a8dff751
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+001
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..5325a8dff751
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+001
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
new file mode 100644
index 000000000000..5325a8dff751
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
@@ -0,0 +1 @@
+001
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings_list
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..5902f77e7e42
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+002
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..5902f77e7e42
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+002
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..5902f77e7e42
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+002
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
new file mode 100644
index 000000000000..5902f77e7e42
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
@@ -0,0 +1 @@
+002
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings_list
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id
new file mode 100644
index 000000000000..48082f72f087
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/id
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+10
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..d411bb7c1aca
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+400
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id
new file mode 100644
index 000000000000..48082f72f087
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/id
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+10
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..d411bb7c1aca
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+400
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id
new file mode 100644
index 000000000000..48082f72f087
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/id
@@ -0,0 +1 @@
+12
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+10
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..d411bb7c1aca
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+400
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
new file mode 100644
index 000000000000..d411bb7c1aca
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
@@ -0,0 +1 @@
+400
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings_list
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id
new file mode 100644
index 000000000000..b1bd38b62a08
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/id
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..5ae5aef8442c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+800
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id
new file mode 100644
index 000000000000..b1bd38b62a08
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/id
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..5ae5aef8442c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+800
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id
new file mode 100644
index 000000000000..b1bd38b62a08
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/id
@@ -0,0 +1 @@
+13
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..5ae5aef8442c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+800
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
new file mode 100644
index 000000000000..5ae5aef8442c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
@@ -0,0 +1 @@
+800
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings_list
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..8f3cca4f016a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+004
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..8f3cca4f016a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+004
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..8f3cca4f016a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+004
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
new file mode 100644
index 000000000000..8f3cca4f016a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
@@ -0,0 +1 @@
+004
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings_list
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..e195199bee51
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+008
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..e195199bee51
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+008
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..e195199bee51
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+008
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
new file mode 100644
index 000000000000..e195199bee51
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
@@ -0,0 +1 @@
+008
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings_list
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+4
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..9e8493eaee24
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+010
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+4
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..9e8493eaee24
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+010
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+4
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..9e8493eaee24
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+010
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_id
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
new file mode 100644
index 000000000000..9e8493eaee24
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
@@ -0,0 +1 @@
+010
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings_list
@@ -0,0 +1 @@
+4
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..fb6187e9e012
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+020
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..fb6187e9e012
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+020
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..fb6187e9e012
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+020
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_id
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
@@ -0,0 +1 @@
+03f
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
new file mode 100644
index 000000000000..fb6187e9e012
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
@@ -0,0 +1 @@
+020
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings_list
@@ -0,0 +1 @@
+5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/id
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..1e8b31496214
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+6
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..9070bc301771
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+040
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/id
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..1e8b31496214
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+6
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..9070bc301771
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+040
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/id
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..1e8b31496214
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+6
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..9070bc301771
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+040
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
new file mode 100644
index 000000000000..9070bc301771
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
@@ -0,0 +1 @@
+040
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list
new file mode 100644
index 000000000000..1e8b31496214
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings_list
@@ -0,0 +1 @@
+6
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/id
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..7f8f011eb73d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+7
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..fa5c7835bd30
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+080
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/id
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..7f8f011eb73d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+7
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..fa5c7835bd30
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+080
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/id
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..7f8f011eb73d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+7
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..fa5c7835bd30
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+080
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
new file mode 100644
index 000000000000..fa5c7835bd30
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
@@ -0,0 +1 @@
+080
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list
new file mode 100644
index 000000000000..7f8f011eb73d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings_list
@@ -0,0 +1 @@
+7
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/id
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+8
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..29d6383b52c1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+100
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/id
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+8
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..29d6383b52c1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+100
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id
new file mode 100644
index 000000000000..f599e28b8ab0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/id
@@ -0,0 +1 @@
+10
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+8
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..29d6383b52c1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+100
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_id
@@ -0,0 +1 @@
+2
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
new file mode 100644
index 000000000000..29d6383b52c1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
@@ -0,0 +1 @@
+100
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list
new file mode 100644
index 000000000000..45a4fb75db86
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings_list
@@ -0,0 +1 @@
+8
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/id
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/id
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_list
@@ -0,0 +1 @@
+9
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map
new file mode 100644
index 000000000000..08839f6bb296
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/shared_cpu_map
@@ -0,0 +1 @@
+200
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type
new file mode 100644
index 000000000000..0b7088ec6330
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index0/type
@@ -0,0 +1 @@
+Data
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/id
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/id
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/level
@@ -0,0 +1 @@
+1
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_list
@@ -0,0 +1 @@
+9
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map
new file mode 100644
index 000000000000..08839f6bb296
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/shared_cpu_map
@@ -0,0 +1 @@
+200
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size
new file mode 100644
index 000000000000..56b868b2a363
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/size
@@ -0,0 +1 @@
+32K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type
new file mode 100644
index 000000000000..9a53cbfa32a8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index1/type
@@ -0,0 +1 @@
+Instruction
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/id
new file mode 100644
index 000000000000..b4de39476753
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/id
@@ -0,0 +1 @@
+11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level
new file mode 100644
index 000000000000..0cfbf08886fc
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/level
@@ -0,0 +1 @@
+2
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_list
@@ -0,0 +1 @@
+9
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map
new file mode 100644
index 000000000000..08839f6bb296
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/shared_cpu_map
@@ -0,0 +1 @@
+200
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size
new file mode 100644
index 000000000000..7a3f37367c74
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/size
@@ -0,0 +1 @@
+256K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index2/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/level
@@ -0,0 +1 @@
+3
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/shared_cpu_map
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size
new file mode 100644
index 000000000000..c05ac8b9042d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/size
@@ -0,0 +1 @@
+15360K
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type
new file mode 100644
index 000000000000..e4fd9dccda2c
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/cache/index3/type
@@ -0,0 +1 @@
+Unified
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/online
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id
new file mode 100644
index 000000000000..00750edc07d6
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_id
@@ -0,0 +1 @@
+3
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
@@ -0,0 +1 @@
+fc0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id
new file mode 100644
index 000000000000..d00491fd7e5b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
new file mode 100644
index 000000000000..08839f6bb296
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
@@ -0,0 +1 @@
+200
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings_list
@@ -0,0 +1 @@
+9
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/online
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/online
new file mode 100644
index 000000000000..536e621dccf7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/online
@@ -0,0 +1 @@
+0-11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/cpu/present
b/tests/vircaps2xmldata/linux-resctrl/system/cpu/present
new file mode 100644
index 000000000000..536e621dccf7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/cpu/present
@@ -0,0 +1 @@
+0-11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0
new file mode 120000
index 000000000000..c841bea28b2b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu0
@@ -0,0 +1 @@
+../../cpu/cpu0
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1
new file mode 120000
index 000000000000..5f4536279e70
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu1
@@ -0,0 +1 @@
+../../cpu/cpu1
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2
new file mode 120000
index 000000000000..2dcca332cecb
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu2
@@ -0,0 +1 @@
+../../cpu/cpu2
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3
new file mode 120000
index 000000000000..c7690e5aa678
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu3
@@ -0,0 +1 @@
+../../cpu/cpu3
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4
new file mode 120000
index 000000000000..9e77a64eb4c8
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu4
@@ -0,0 +1 @@
+../../cpu/cpu4
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5
new file mode 120000
index 000000000000..cc07c3b97bfe
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpu5
@@ -0,0 +1 @@
+../../cpu/cpu5
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist
new file mode 100644
index 000000000000..82a99f2907a0
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpulist
@@ -0,0 +1 @@
+0-5
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap
new file mode 100644
index 000000000000..d37ac748bd91
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/cpumap
@@ -0,0 +1 @@
+03f
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance
new file mode 100644
index 000000000000..bdfaa851d0e7
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/distance
@@ -0,0 +1 @@
+10 21
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-1048576kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node0/hugepages/hugepages-2048kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10
new file mode 120000
index 000000000000..a6dc6bb10e8b
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu10
@@ -0,0 +1 @@
+../../cpu/cpu10
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11
new file mode 120000
index 000000000000..e29d8982840a
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu11
@@ -0,0 +1 @@
+../../cpu/cpu11
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6
new file mode 120000
index 000000000000..2e7576354f93
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu6
@@ -0,0 +1 @@
+../../cpu/cpu6
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7
new file mode 120000
index 000000000000..09e3f79b43d1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu7
@@ -0,0 +1 @@
+../../cpu/cpu7
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8
new file mode 120000
index 000000000000..bda10cc34376
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu8
@@ -0,0 +1 @@
+../../cpu/cpu8
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9
new file mode 120000
index 000000000000..1ec1db255a97
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpu9
@@ -0,0 +1 @@
+../../cpu/cpu9
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist
new file mode 100644
index 000000000000..fd6c445982a1
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpulist
@@ -0,0 +1 @@
+6-11
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap
new file mode 100644
index 000000000000..6c3274debe2f
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/cpumap
@@ -0,0 +1 @@
+fc0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance
new file mode 100644
index 000000000000..b7621ea9d2bf
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/distance
@@ -0,0 +1 @@
+21 10
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/free_hugepages
@@ -0,0 +1 @@
+4
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
new file mode 100644
index 000000000000..b8626c4cff28
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages
@@ -0,0 +1 @@
+4
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-1048576kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/free_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages
@@ -0,0 +1 @@
+0
diff --git
a/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
new file mode 100644
index 000000000000..573541ac9702
--- /dev/null
+++
b/tests/vircaps2xmldata/linux-resctrl/system/node/node1/hugepages/hugepages-2048kB/surplus_hugepages
@@ -0,0 +1 @@
+0
diff --git a/tests/vircaps2xmldata/linux-resctrl/system/node/online
b/tests/vircaps2xmldata/linux-resctrl/system/node/online
new file mode 100644
index 000000000000..8b0fab869c1d
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-resctrl/system/node/online
@@ -0,0 +1 @@
+0-1
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
new file mode 100644
index 000000000000..c30ea8751175
--- /dev/null
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
@@ -0,0 +1,49 @@
+<capabilities>
+
+ <host>
+ <cpu>
+ <arch>x86_64</arch>
+ </cpu>
+ <power_management/>
+ <migration_features>
+ <live/>
+ </migration_features>
+ <topology>
+ <cells num='2'>
+ <cell id='0'>
+ <memory unit='KiB'>1048576</memory>
+ <pages unit='KiB' size='4'>2048</pages>
+ <pages unit='KiB' size='2048'>4096</pages>
+ <pages unit='KiB' size='1048576'>6144</pages>
+ <cpus num='6'>
+ <cpu id='0' socket_id='0' core_id='0'
siblings='0'/>
+ <cpu id='1' socket_id='0' core_id='1'
siblings='1'/>
+ <cpu id='2' socket_id='0' core_id='2'
siblings='2'/>
+ <cpu id='3' socket_id='0' core_id='3'
siblings='3'/>
+ <cpu id='4' socket_id='0' core_id='4'
siblings='4'/>
+ <cpu id='5' socket_id='0' core_id='5'
siblings='5'/>
+ </cpus>
+ </cell>
+ <cell id='1'>
+ <memory unit='KiB'>2097152</memory>
+ <pages unit='KiB' size='4'>4096</pages>
+ <pages unit='KiB' size='2048'>6144</pages>
+ <pages unit='KiB' size='1048576'>8192</pages>
+ <cpus num='6'>
+ <cpu id='6' socket_id='1' core_id='0'
siblings='6'/>
+ <cpu id='7' socket_id='1' core_id='1'
siblings='7'/>
+ <cpu id='8' socket_id='1' core_id='2'
siblings='8'/>
+ <cpu id='9' socket_id='1' core_id='3'
siblings='9'/>
+ <cpu id='10' socket_id='1' core_id='4'
siblings='10'/>
+ <cpu id='11' socket_id='1' core_id='5'
siblings='11'/>
+ </cpus>
+ </cell>
+ </cells>
+ </topology>
+ <cache>
+ <bank id='0' level='3' type='unified'
size='15360' unit='KiB' cpus='0-5'/>
+ <bank id='1' level='3' type='unified'
size='15360' unit='KiB' cpus='6-11'/>
+ </cache>
+ </host>
+
+</capabilities>
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 31d027979cab..f590249e6eba 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -111,6 +111,8 @@ mymain(void)
DO_TEST("caches", VIR_ARCH_X86_64);
+ DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true);
+
return ret;
}
--
2.12.2
8:38 p.m.
New subject: [libvirt] [PATCH v2 12/12] tests: Add resctrl test for vircaps2xmltest
On Wednesday, 5 April 2017 at 10:36 PM, Martin Kletzander wrote:
Add info from yet another machine, this time with resctrl data so
that
we can extend tests easily in a test-driven way.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com
(mailto:mkletzan@redhat.com)>
---
tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 +
.../linux-resctrl/resctrl/info/L3/cbm_mask | 1 +
.../linux-resctrl/resctrl/info/L3/min_cbm_bits | 1 +
.../linux-resctrl/resctrl/info/L3/num_closids | 1 +
.../linux-resctrl/resctrl/manualres/cpus | 1 +
.../linux-resctrl/resctrl/manualres/schemata | 1 +
.../linux-resctrl/resctrl/manualres/tasks | 0
.../vircaps2xmldata/linux-resctrl/resctrl/schemata | 1 +
tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0
This is great and it is what we want before enable CAT in libvirt, but seems that if we
want to test CDP enabled, we need another linux-resctrl directory?
how about separate resctrl from linux-resctrl?
Eli.
3:47 a.m.
New subject: [libvirt] [PATCH v2 12/12] tests: Add resctrl test for vircaps2xmltest
On Thu, Apr 06, 2017 at 09:38:35AM +0800, Eli Qiao wrote:
On Wednesday, 5 April 2017 at 10:36 PM, Martin Kletzander wrote:
> Add info from yet another machine, this time with resctrl data so that
> we can extend tests easily in a test-driven way.
>
> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com
(mailto:mkletzan@redhat.com)>
> ---
> tests/vircaps2xmldata/linux-resctrl/resctrl/cpus | 1 +
> .../linux-resctrl/resctrl/info/L3/cbm_mask | 1 +
> .../linux-resctrl/resctrl/info/L3/min_cbm_bits | 1 +
> .../linux-resctrl/resctrl/info/L3/num_closids | 1 +
> .../linux-resctrl/resctrl/manualres/cpus | 1 +
> .../linux-resctrl/resctrl/manualres/schemata | 1 +
> .../linux-resctrl/resctrl/manualres/tasks | 0
> .../vircaps2xmldata/linux-resctrl/resctrl/schemata | 1 +
> tests/vircaps2xmldata/linux-resctrl/resctrl/tasks | 0
This is great and it is what we want before enable CAT in libvirt, but seems that if we
want to test CDP enabled, we need another linux-resctrl directory?
how about separate resctrl from linux-resctrl?
Sure, I hope there will be many of them, each testing different
scenarios. linux-resctrl2, linux-resctrlN, linux-cdp-resctrl,
linux-whatever-new-directory, whenever we want any new one.
Eli.
7:49 a.m.
New subject: [libvirt] [PATCH v2 12/12] tests: Add resctrl test for vircaps2xmltest
On Wed, Apr 05, 2017 at 04:36:35PM +0200, Martin Kletzander wrote:
Add info from yet another machine, this time with resctrl data so
that
we can extend tests easily in a test-driven way.
Again, if something was wrong with this, one couldn't know. ACK to both 11/12
and 12/12.
Erik
2820
days inactive
2822
days old
37 comments
4 participants
participants (4)
-
Eli Qiao -
Erik Skultety -
Martin Kletzander -
Peter Krempa