[libvirt] [PATCH] virsh: domifstat: clarify description of --help option
by ZhiPeng Lu
<interface-device> can be the interface target by
name or MAC address. So clarify description of --help option
Signed-off-by:ZhiPeng Lu <lu.zhipeng(a)zte.com.cn>
---
tools/virsh-domain-monitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 960fd37..4e8fc46 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -995,7 +995,7 @@ static const vshCmdOptDef opts_domifstat[] = {
{.name = "interface",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
- .help = N_("interface device")
+ .help = N_("interface device (MAC Address)")
},
{.name = NULL}
};
--
1.8.3.1
7 years, 1 month
- 2
- 1
[libvirt] [PATCH 00/11] qemu: Fix <shareable/> disks for new qemu
by Peter Krempa
Introduction of the disk image locking in qemu created a regression
where disk shared access with <shareable/> would not work.
Since the disk locking is a desired feature, allow libvirt to configure
qemu in such way that <shareable/> disks are exempt from write locks.
First few patches refactor some stuff so that it's less ugly.
This series also mandates that sharing is used only with 'raw' disks
since other formats could corrupt metadata.
Peter Krempa (11):
qemu: Move snapshot disk validation functions into one
qemu: domain: Despaghetify qemuDomainDeviceDefValidate
qemu: domain: Move hostdev validation into separate function
qemu: domain: Move video device validation into separate function
qemu: domain: Refactor domain device validation function
qemu: block: Add function to check if storage source allows concurrent
access
qemu: domain: Reject shared disk access if backing format does not
support it
qemu: snapshot: Disallow snapshot of unsupported shared disks
qemu: Disallow pivot of shared disks to unsupported storage
qemu: caps: Add capability for 'share-rw' disk option
qemu: command: Mark <shared/> disks as such in qemu
src/qemu/qemu_block.c | 15 ++
src/qemu/qemu_block.h | 3 +
src/qemu/qemu_capabilities.c | 2 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 4 +
src/qemu/qemu_domain.c | 291 +++++++++++++--------
src/qemu/qemu_driver.c | 121 +++++----
.../caps_2.10.0-gicv2.aarch64.xml | 1 +
.../caps_2.10.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
.../qemuxml2argv-disk-drive-shared-locking.args | 28 ++
.../qemuxml2argv-disk-drive-shared-locking.xml | 36 +++
.../qemuxml2argv-disk-drive-shared-qcow.xml | 28 ++
.../qemuxml2argv-disk-drive-shared.args | 2 +-
.../qemuxml2argv-disk-drive-shared.xml | 2 +-
tests/qemuxml2argvtest.c | 3 +
19 files changed, 378 insertions(+), 164 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-locking.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared-qcow.xml
--
2.14.3
7 years, 1 month
- 1
- 12
[libvirt] [PATCH] build: Fix make dist
by Martin Kletzander
Since we don't pack symlinks we cannot have recursive loops in them. Since we
need one directory to be in tests/vircaps2xmldata/linux-caches/, instead of
creating a symlink, just move the files in that directory and adjust tests.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
Pushed under the build-breaker rule
tests/vircaps2xmldata/linux-caches/system | 1 -
.../linux-caches/{ => system}/cpu/cpu0/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index0/level | 0
.../{ => system}/cpu/cpu0/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index1/level | 0
.../{ => system}/cpu/cpu0/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index2/level | 0
.../{ => system}/cpu/cpu0/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index3/level | 0
.../{ => system}/cpu/cpu0/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu0/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu0/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu0/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings | 0
.../{ => system}/cpu/cpu0/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index0/level | 0
.../{ => system}/cpu/cpu1/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index1/level | 0
.../{ => system}/cpu/cpu1/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index2/level | 0
.../{ => system}/cpu/cpu1/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index3/level | 0
.../{ => system}/cpu/cpu1/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu1/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu1/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu1/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings | 0
.../{ => system}/cpu/cpu1/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index0/level | 0
.../{ => system}/cpu/cpu2/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index1/level | 0
.../{ => system}/cpu/cpu2/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index2/level | 0
.../{ => system}/cpu/cpu2/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index3/level | 0
.../{ => system}/cpu/cpu2/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu2/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu2/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu2/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings | 0
.../{ => system}/cpu/cpu2/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index0/level | 0
.../{ => system}/cpu/cpu3/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index1/level | 0
.../{ => system}/cpu/cpu3/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index2/level | 0
.../{ => system}/cpu/cpu3/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index3/level | 0
.../{ => system}/cpu/cpu3/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu3/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu3/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu3/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings | 0
.../{ => system}/cpu/cpu3/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index0/level | 0
.../{ => system}/cpu/cpu4/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index1/level | 0
.../{ => system}/cpu/cpu4/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index2/level | 0
.../{ => system}/cpu/cpu4/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index3/level | 0
.../{ => system}/cpu/cpu4/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu4/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu4/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu4/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings | 0
.../{ => system}/cpu/cpu4/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index0/level | 0
.../{ => system}/cpu/cpu5/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index1/level | 0
.../{ => system}/cpu/cpu5/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index2/level | 0
.../{ => system}/cpu/cpu5/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index3/level | 0
.../{ => system}/cpu/cpu5/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu5/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu5/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu5/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings | 0
.../{ => system}/cpu/cpu5/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index0/level | 0
.../{ => system}/cpu/cpu6/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index1/level | 0
.../{ => system}/cpu/cpu6/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index2/level | 0
.../{ => system}/cpu/cpu6/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index3/level | 0
.../{ => system}/cpu/cpu6/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu6/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu6/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu6/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings | 0
.../{ => system}/cpu/cpu6/topology/thread_siblings_list | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index0/id | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index0/level | 0
.../{ => system}/cpu/cpu7/cache/index0/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index0/size | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index0/type | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index1/id | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index1/level | 0
.../{ => system}/cpu/cpu7/cache/index1/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index1/size | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index1/type | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index2/id | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index2/level | 0
.../{ => system}/cpu/cpu7/cache/index2/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index2/size | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index2/type | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index3/id | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index3/level | 0
.../{ => system}/cpu/cpu7/cache/index3/shared_cpu_list | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index3/size | 0
.../linux-caches/{ => system}/cpu/cpu7/cache/index3/type | 0
.../linux-caches/{ => system}/cpu/cpu7/topology/core_id | 0
.../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings | 0
.../linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list | 0
.../{ => system}/cpu/cpu7/topology/physical_package_id | 0
.../linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings | 0
.../{ => system}/cpu/cpu7/topology/thread_siblings_list | 0
tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max | 0
tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online | 0
tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/online | 0
tests/vircaps2xmldata/linux-caches/{ => system}/node/possible | 0
tests/vircaps2xmltest.c | 7 ++++---
257 files changed, 4 insertions(+), 4 deletions(-)
delete mode 120000 tests/vircaps2xmldata/linux-caches/system
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu0/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu1/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu2/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu3/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu4/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu5/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu6/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index0/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index1/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index2/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/level (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/shared_cpu_map (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/size (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/cache/index3/type (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/core_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/physical_package_id (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/cpu7/topology/thread_siblings_list (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/kernel_max (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/online (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/cpu/present (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu0 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu1 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu2 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu3 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu4 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu5 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu6 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpu7 (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/cpulist (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/node0/meminfo (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/online (100%)
rename tests/vircaps2xmldata/linux-caches/{ => system}/node/possible (100%)
diff --git a/tests/vircaps2xmldata/linux-caches/system b/tests/vircaps2xmldata/linux-caches/system
deleted file mode 120000
index 945c9b46d684..000000000000
--- a/tests/vircaps2xmldata/linux-caches/system
+++ /dev/null
@@ -1 +0,0 @@
-.
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu0/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu1/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu2/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu3/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu4/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu5/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu6/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index0/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index0/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index1/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index1/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index2/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index2/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/level
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/level
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/shared_cpu_map
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/shared_cpu_map
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/size
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/size
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/cache/index3/type
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/cache/index3/type
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/core_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/physical_package_id
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/physical_package_id
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/cpu7/topology/thread_siblings_list
rename to tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings_list
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/kernel_max b/tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/kernel_max
rename to tests/vircaps2xmldata/linux-caches/system/cpu/kernel_max
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/online b/tests/vircaps2xmldata/linux-caches/system/cpu/online
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/online
rename to tests/vircaps2xmldata/linux-caches/system/cpu/online
diff --git a/tests/vircaps2xmldata/linux-caches/cpu/present b/tests/vircaps2xmldata/linux-caches/system/cpu/present
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/cpu/present
rename to tests/vircaps2xmldata/linux-caches/system/cpu/present
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu0 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu0
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu0
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu1 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu1
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu1
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu2 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu2
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu2
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu3 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu3
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu3
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu4 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu4
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu4
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu5 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu5
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu5
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu6 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu6
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu6
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpu7 b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpu7
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpu7
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/cpulist b/tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/cpulist
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/cpulist
diff --git a/tests/vircaps2xmldata/linux-caches/node/node0/meminfo b/tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/node0/meminfo
rename to tests/vircaps2xmldata/linux-caches/system/node/node0/meminfo
diff --git a/tests/vircaps2xmldata/linux-caches/node/online b/tests/vircaps2xmldata/linux-caches/system/node/online
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/online
rename to tests/vircaps2xmldata/linux-caches/system/node/online
diff --git a/tests/vircaps2xmldata/linux-caches/node/possible b/tests/vircaps2xmldata/linux-caches/system/node/possible
similarity index 100%
rename from tests/vircaps2xmldata/linux-caches/node/possible
rename to tests/vircaps2xmldata/linux-caches/system/node/possible
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 12c43f42c6b9..ede546825edc 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -111,12 +111,13 @@ mymain(void)
ret = -1; \
} while (0)
-#define DO_TEST(filename, arch) DO_TEST_FULL(filename, arch, true, true, false)
-
DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false, false);
DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false, false);
- DO_TEST("caches", VIR_ARCH_X86_64);
+ /* We say there is 'resctrl' even though there is none. This is special
+ * case because we want to use this test data for a negative tests for
+ * resctrl. */
+ DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true, true);
DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true);
DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true);
--
2.15.0
7 years, 1 month
- 1
- 0
[libvirt] Set allmulticast automatically on macvtap interfaces
by Marc Haber
Hi,
the easiest way to connect a domain to a network is a macvtap interface
with the following XML code:
<interface type='direct'>
<mac address='52:54:00:fb:de:4d'/>
<source dev='int181' mode='bridge'/>
<target dev='macvtap1'/>
<model type='virtio'/>
<alias name='net0'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
This makes everything work but incoming IPv6, which relies on multicast,
which is filtered by the macvtap interface by default.
I need to do "ip link set dev macvtap1 allmulticast on" on the host
after starting the domain to make incoming IPv6 work.
>From reading the docs, I guess that setting the interface's
trustGuestRxFilters attribute to yes would help here. However,
https://libvirt.org/formatdomain.html#elementsNICS says
If the model type is set to virtio and interface's trustGuestRxFilters
attribute is set to yes, changes made to the interface mac address,
unicast/multicast receive filters, and vlan settings in the guest will
be monitored and propagated to the associated macvtap device on the
host
Does that mean that the guest will be able to change its VLAN to any
other VLAN that is present on the host? Or am I misunderstanding things
here?
Assuming that trustGuestRxFilters is the right thing to do and that it
does not open myself to blatant security issues, how would I set that
from virt-manager?
Greetings
Marc
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421
7 years, 1 month
- 1
- 0
[libvirt] [RFC] externall (pull) backup API
by Nikolay Shirokovskiy
Table of contents.
I Preface
1. Fleece API
2. Export API
3. Incremental backups
4. Other hypervisors
II Links
I Preface
This is a RFC for external (or pull) backup API in libvirt. There was a series [1]
with more limited API scope and functionality for this kind of backup API.
Besides other issues the series was abandoned as qemu blockdev-del command has
experimental status at that time. There is also a long pending RFC series for
internal (or push) backup API [2] which however has not much in comman with
this RFC. Also there is RFC with overall agreement to having a backup API in
libvirt [3].
The aim of external backup API is to provide means for 3d party application to
read/write domain disks as block devices for the purpuse of backup. Disk is
read on backup operation and in case of active domain is presented at some
point in time (preferable in some guest consistent state). Disk is written on
restore operation.
As to providing disk state at some point in time one can use existing disks
snapshots for this purpose. However this RFC introduces API to leverage image
fleecing (blockdev-backup command) instead. Image fleecing is somewhat inverse
to snapshots. In case of snapshots writes go to top image thus backing image
stays constant, in case of fleecing writes go to same image as before but old
data is previously popped out to fleece image which have original image as
backing. As a result fleece image became disk snapshot.
Another task of this API is to provide disks for read/write operations. One
could try to leverage libvirt stream API for this purpose but AFAIK clients
want random access to disks data which is not what stream API suitable for.
I'm not sure what is costs of adding block API to libvirt, particularly what it
costs to make it effective implementation at RPC level thus this RFC add means
to export disks data thru existing block interfaces. For qemu it is NBD.
1. Fleece API
So the below API is to provide means to start/stop/query disk image fleecing.
I use BlockSnaphost name for this operation. Other options are Fleecing, BlockFleecing,
TempBlockSnapshot etc.
/* Start fleecing */
virDomainBlockSnapshotPtr
virDomainBlockSnapshotCreateXML(virDomainPtr domain,
const char *xmlDesc,
unsigned int flags);
/* Stop fleecing */
int
virDomainBlockSnapshotDelete(virDomainBlockSnapshotPtr snapshot,
unsigned int flags);
/* List active fleecings */
virDomainBlockSnapshotList(virDomainPtr domain,
virDomainBlockSnapshotPtr **snaps,
unsigned int flags);
/* Get fleecing description */
char*
virDomainBlockSnapshotGetXMLDesc(virDomainBlockSnapshotPtr snapshot,
unsigned int flags);
/* Get fleecing by name */
virDomainBlockSnapshotPtr
virDomainBlockSnapshotLookupByName(virDomainPtr domain,
const char *name);
Here is a minimal block snapshot xml description to feed creating function:
<domainblocksnapshot>
<snapshot disk='sda'>
<fleece file="/path/to/fleece-image-sda"/>
</snapshot>
<snapshot disk='sdb'>
<fleece file="/path/to/fleece-image-sdb"/>
</snapshot>
</domainblocksnapshot>
Below is an example of what getting description function should provide upon
successful block snaphost creation. The difference with the above xml is that
name element (it can be specified on creation as well) and aliases are
generated. Aliases will be useful later to identify block devices on exporting
thru nbd.
<domainblocksnapshot>
<name>5768a388-c1c4-414c-ac4e-eab216ba7c0c</name>
<snapshot disk='sda'>
<fleece file="/path/to/fleece-image-sda"/>
<alias name="scsi0-0-0-0-backup"/>
</snapshot>
<snapshot disk='sdb'>
<fleece file="/path/to/fleece-image-sdb"/>
<alias name="scsi0-0-0-1-backup"/>
</snapshot>
</domainblocksnapshot>
2. Export API
During backup operation we need to provide read access to fleecing image. This
is done thru qemu process nbd server. We just need to specify the disks to
export.
/* start block export */
int
virDomainBlockExportStart(virDomainPtr domain,
const char *xmlDesc,
unsigned int flags);
/* stop block export */
int
virDomainBlockExportStop(virDomainPtr domain,
const char *diskName,
unsigned int flags);
Here is an example of xml for starting function:
<blockexport type="nbd" port="8001">
<listen type="address" address="10.0.2.10"/>
<disk name="scsi0-0-0-1-backup"/>
</blockexport>
qemu nbd server is started upon first disk export start and shutted down upon
last disk export stop. Another option is to control ndb server explicitly. One
way to do it is to consider ndb server a new device so to start/stop/update ndb
server we can use attach/detach/update device functions. Then in block export
start we need to refer to this device somehow. This can be a generated
name/uuid or type/address pair. Actually this approach to expose ndb server
looks more natural to me even it includes more management from client side.
I am not suggesting it in the first place mostly due to hesitations on how to
refer to ndb server on block export.
In any case I'd like to provide export info in active domain config:
<devices>
<blockexport type="nbd" port="8001">
<listen type="address" address="10.0.2.10"/>
<disk name="scsi0-0-0-1-backup"/>
<disk name="scsi0-0-0-2-backup"/>
</blockexport>
</devices>
This API is used in restore operation too. Domain is started in paused state,
the disks to be restored are exported and backup client fills it with the
backup data.
3. Incremental backups
Qemu can track what disk parts are changed from from fleecing start. This is
what typically called CBT (dirty bitmap in qemu community I guess). There are
also experimental ndb support [4] and a bunch of merged/agreed/proposed bitmap
operation that help to organize incremental backups.
Different hypervisors has different bitmap implementations with different
costs thus it is up to hyperivsor whether to start CBT or not upon block snapshot
create by default. Qemu implementations has memory and disk costs for every
bitmap thus I suggest by default start fleecing without bitmap and add flag
VIR_DOMAIN_BLOCK_SNAPSHOT_CREATE_CHECKPOINT to ask to start a bitmap.
Disks bitmaps are visible in active domain definition with the name
of block snapshot for which bitmap was started.
<disk type='file' device='disk'>
..
<target dev='sda' bus='scsi'/>
<alias name='scsi0-0-0-0'/>
<checkpoint name="93a5c045-6457-2c09-e56c-927cdf34e178">
<checkpoint name="5768a388-c1c4-414c-ac4e-eab216ba7c0c">
..
</disk>
The bitmap can be specified upon disk export like below (I guess there
is no need to provide more then one bitmap per disk). Active domain
config section for block export is expanded similarly.
<blockexport type="nbd" port="8001">
<listen type="address" address="10.0.2.10"/>
<disk name="scsi0-0-0-1-backup" checkpoint="5768a388-c1c4-414c-ac4e-eab216ba7c0c"/>
</blockexport>
If bitmap was created on backup start but client failed to make a backup for some reason
then it makes no sense to keep this checkpoint anymore. As having bitmap takes
resources it is convinient to drop bitmap in this case. Also one may
want to drop bitmap for pure resource managment issues. So we need API to remove bitmap:
virDomainBlockCheckpointRemove(virDomainPtr domain,
const char *name,
unsigned int flags);
4. Other hypervisors
I took a somewhat considerable look only at vmware backup interface at [5] etc.
Looks like they don't have fleecing like qemu has so for vmware snapshots one
can use usual disks snapshots API. Also there is no nbd interface for snapshots
expectedly thus to deal with vmware snapshot disks one eventually will have to
add block API to libvirt. So the only point this RFC has to vmware backups is
exporting checkpoints in disk xml. The vmware documentation does not say much
about bitmap limitations but I guess they still can provide only a number of
them which can be exposed as suggested for active domain disks.
II Links:
[1] https://www.redhat.com/archives/libvir-list/2016-September/msg00192.html
[2] https://www.redhat.com/archives/libvir-list/2017-May/msg00379.html
[3] https://www.redhat.com/archives/libvir-list/2016-March/msg00937.html
[4] https://github.com/NetworkBlockDevice/nbd/commit/cfa8ebfc354b2adbdf73b6e6...
[5] https://code.vmware.com/doc/preview?id=4076#/doc/vddkBkupVadp.9.3.html#10...
7 years, 1 month
- 1
- 1
[libvirt] [PATCH 0/6] implement support to configure sound output
by Pavel Hrdina
Pavel Hrdina (6):
tests: add test cases for default sound output
qemu: move QEMU_AUDIO_DRIVER out of graphic into sound
qemu: explicitly disable audio if there is no sound device
conf: introduce <output> element for <sound> devices
qemu: implement <output> element for <sound> devices
tests: add test cases for specific sound output
docs/formatdomain.html.in | 11 ++++
docs/schemas/domaincommon.rng | 14 ++++
src/conf/domain_conf.c | 61 ++++++++++++++++++
src/conf/domain_conf.h | 14 ++++
src/libvirt_private.syms | 2 +
src/qemu/qemu_command.c | 75 ++++++++++++++--------
src/qemu/qemu_domain.c | 54 ++++++++++++++++
src/qemu/qemu_process.c | 41 ++++++++++++
.../qemuxml2argv-channel-spicevmc-old.args | 2 +-
.../qemuxml2argv-channel-spicevmc.args | 2 +-
.../qemuxml2argv-clock-france.args | 2 +-
.../qemuxml2argv-graphics-sdl-fullscreen.args | 1 +
.../qemuxml2argv-graphics-sdl.args | 1 +
...emuxml2argv-graphics-spice-agent-file-xfer.args | 2 +-
.../qemuxml2argv-graphics-spice-agentmouse.args | 2 +-
...emuxml2argv-graphics-spice-auto-socket-cfg.args | 2 +-
.../qemuxml2argv-graphics-spice-auto-socket.args | 2 +-
.../qemuxml2argv-graphics-spice-compression.args | 2 +-
.../qemuxml2argv-graphics-spice-no-args.args | 2 +-
.../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +-
.../qemuxml2argv-graphics-spice-sasl.args | 2 +-
.../qemuxml2argv-graphics-spice-socket.args | 2 +-
.../qemuxml2argv-graphics-spice-usb-redir.args | 2 +-
.../qemuxml2argv-graphics-spice.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-name-escape.args | 2 +-
.../qemuxml2argv-serial-spiceport.args | 2 +-
.../qemuxml2argv-sound-default-output-sdl.args | 23 +++++++
.../qemuxml2argv-sound-default-output-sdl.xml | 24 +++++++
...emuxml2argv-sound-default-output-spice-vnc.args | 25 ++++++++
...qemuxml2argv-sound-default-output-spice-vnc.xml | 25 ++++++++
.../qemuxml2argv-sound-default-output-spice.args | 24 +++++++
.../qemuxml2argv-sound-default-output-spice.xml | 24 +++++++
...emuxml2argv-sound-default-output-vnc-spice.args | 25 ++++++++
...qemuxml2argv-sound-default-output-vnc-spice.xml | 25 ++++++++
.../qemuxml2argv-sound-default-output-vnc.args | 24 +++++++
.../qemuxml2argv-sound-default-output-vnc.xml | 24 +++++++
...xml2argv-sound-multi-different-output-spice.xml | 29 +++++++++
.../qemuxml2argv-sound-multi-pa-output-spice.args | 26 ++++++++
.../qemuxml2argv-sound-multi-pa-output-spice.xml | 27 ++++++++
.../qemuxml2argv-sound-pa-output-spice.args | 24 +++++++
.../qemuxml2argv-sound-pa-output-spice.xml | 26 ++++++++
.../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +-
tests/qemuxml2argvtest.c | 34 ++++++++++
43 files changed, 675 insertions(+), 42 deletions(-)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-sdl.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-sdl.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice-vnc.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice-vnc.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-spice.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc-spice.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc-spice.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-default-output-vnc.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-different-output-spice.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-pa-output-spice.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-multi-pa-output-spice.xml
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-pa-output-spice.args
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-sound-pa-output-spice.xml
--
2.13.6
7 years, 1 month
- 4
- 36
[libvirt] [PATCH 00/12] qemu: command: Move frontend disk attributes to -device (blockdev-add saga)
by Peter Krempa
For legacy reasons we've formatted some attributes of the disk frontend
in -drive which now mostly holds backend arguments. (-drive was used by
itself some time ago and still is for sdcards)
Since we will no longer use -drive with -blockdev, some of them need to
be moved (and the rest interpreted with -blockdev).
Peter Krempa (12):
qemu: command: Split out geometry frontend attribute formatting from
-drive
qemu: command: Format frontend props with -device rather than -drive
tests: qemuxml2xml: Run the 'disk-serial' test
tests: qemuxml2argv: Test SD card with serial number
qemu: command: Move disk 'serial' into frontend parameter formatter
qemu: command: Move around order of generating -drive arguments
qemu: command: Refactor logic when formatting -drive
qemu: command: Move disk trhottling argument building into a separate
function
qemu: command: Move formatting of disk io error policy from -drive
qemu: command: Move around logic for formatting bootindex
qemu: command: Move formatting of 'boot' attribute to -device
qemu: command: Explain formatting of 'media=cdrom' in -drive
src/qemu/qemu_command.c | 252 ++++++++++++---------
src/qemu/qemu_command.h | 2 +-
src/qemu/qemu_hotplug.c | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 2 +-
.../qemuxml2argv-boot-complex-bootindex.args | 2 +-
.../qemuxml2argv-boot-complex.args | 6 +-
...xml2argv-boot-menu-disable-drive-bootindex.args | 2 +-
.../qemuxml2argv-boot-menu-disable-drive.args | 2 +-
.../qemuxml2argv-boot-menu-disable.args | 2 +-
.../qemuxml2argv-boot-menu-enable-bootindex.args | 2 +-
...qemuxml2argv-boot-menu-enable-with-timeout.args | 2 +-
.../qemuxml2argv-boot-menu-enable.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-order.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 2 +-
.../qemuxml2argv-controller-order.args | 2 +-
tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 4 +-
.../qemuxml2argv-disk-cdrom-empty.args | 2 +-
.../qemuxml2argv-disk-cdrom-network-ftp.args | 2 +-
.../qemuxml2argv-disk-cdrom-network-ftps.args | 2 +-
.../qemuxml2argv-disk-cdrom-network-http.args | 2 +-
.../qemuxml2argv-disk-cdrom-network-https.args | 2 +-
.../qemuxml2argv-disk-cdrom-network-tftp.args | 2 +-
...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 2 +-
.../qemuxml2argv-disk-cdrom-tray.args | 4 +-
.../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 2 +-
.../qemuxml2argv-disk-copy_on_read.args | 2 +-
.../qemuxml2argv-disk-drive-boot-cdrom.args | 4 +-
.../qemuxml2argv-disk-drive-boot-disk.args | 4 +-
.../qemuxml2argv-disk-drive-cache-directsync.args | 4 +-
.../qemuxml2argv-disk-drive-cache-unsafe.args | 4 +-
.../qemuxml2argv-disk-drive-cache-v2-none.args | 4 +-
.../qemuxml2argv-disk-drive-cache-v2-wb.args | 4 +-
.../qemuxml2argv-disk-drive-cache-v2-wt.args | 4 +-
.../qemuxml2argv-disk-drive-detect-zeroes.args | 2 +-
.../qemuxml2argv-disk-drive-discard.args | 2 +-
...uxml2argv-disk-drive-error-policy-enospace.args | 9 +-
.../qemuxml2argv-disk-drive-error-policy-stop.args | 9 +-
...gv-disk-drive-error-policy-wreport-rignore.args | 9 +-
.../qemuxml2argv-disk-drive-fmt-qcow.args | 4 +-
.../qemuxml2argv-disk-drive-no-boot.args | 4 +-
.../qemuxml2argv-disk-drive-readonly-disk.args | 2 +-
...qemuxml2argv-disk-drive-readonly-no-device.args | 2 +-
.../qemuxml2argv-disk-drive-shared.args | 9 +-
.../qemuxml2argv-disk-geometry.args | 6 +-
.../qemuxml2argv-disk-ide-wwn.args | 5 +-
.../qemuxml2argv-disk-ioeventfd.args | 2 +-
.../qemuxml2argvdata/qemuxml2argv-disk-order.args | 4 +-
.../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 9 +-
.../qemuxml2argvdata/qemuxml2argv-disk-serial.xml | 5 +
.../qemuxml2argv-disk-snapshot.args | 4 +-
.../qemuxml2argv-disk-source-pool-mode.args | 12 +-
.../qemuxml2argv-disk-source-pool.args | 4 +-
.../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 4 +-
tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +-
.../qemuxml2argv-graphics-spice-timeout.args | 2 +-
.../qemuxml2argv-hugepages-numa.args | 2 +-
.../qemuxml2argv-pci-autoadd-addr.args | 4 +-
.../qemuxml2argv-pci-autoadd-idx.args | 4 +-
.../qemuxml2argv-pci-autofill-addr.args | 4 +-
.../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 4 +-
tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 4 +-
.../qemuxml2argv-user-aliases.args | 2 +-
.../qemuxml2xmlout-disk-serial.xml | 47 ++++
tests/qemuxml2xmltest.c | 2 +
65 files changed, 305 insertions(+), 219 deletions(-)
create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-serial.xml
--
2.14.3
7 years, 1 month
- 1
- 13
[libvirt] [PATCH 00/21] Initial support for resctrl (CAT)
by Martin Kletzander
This is an initial support for resctrl, so that domains can make use of
Cache Allocation Technology (🐈). After bunch of initial discussions I
followed most of those things except one detail. In order to
distinguish different allocations while minimizing the number of them at
the same time, I changed the XML design, but only slightly. See docs in
patch 17 for detail.
There is still much missing, but all is designed in a way that should
not collied with the future additions. Missing features include:
- After allocation is created the file should be re-read and parsed
into the al the allocation so that the masks reflect what kernel
actually uses (just in case there was a change)
- When formatting live XML, used masks for allocations should be
formatted as well
- Each <cache/> should support shared allocations, for now every single
allocation is exclusive only
- Suuport for different backing, particularly if allocation has
type='both' (code as well as data) and the host supports CDP (Code
Data Partitioning), meaning it can allocate code and data portions
separately the code currently fails even though it is possible to
convert such allocation.
- APIs for manipulation with various resctrl groups. What's needed is
reading and setting values of the default group as well as any
cachetune of a domain.
Martin Kletzander (21):
Only output initialized capabilities with VIR_TEST_DEBUG > 1
util: Introduce virPrettySize
util: Make prefix optional in virBitampString
util: Rename virBitmapString to virBitmapToString
util: Rename virBitmapDataToString to virBitmapDataFormat
util: Don't output too many zeros from virBitmapToString
util: Introduce virBitmapNewString
util: Reintroduce virBitmapSubtract
util: Introduce virBitmapShrink
conf: Sort cache banks in capabilities XML
conf: Format cache banks in capabilities with virPrettySize
resctrl: Instantiate all resctrl information at once
tests: Remove executable bits on plain data files
tests: Change some schemata for the default group
caps2xml resctrl-skx-twocaches
resctrl: Add functions to work with resctrl allocations
conf: cachetune
tests: Minor adjustments for test data
tests: Add virresctrltest
qemu: Add support for resctrl
docs: Add CAT (resctrl) support into news.xml
docs/formatdomain.html.in | 24 +
docs/news.xml | 11 +
docs/schemas/domaincommon.rng | 32 +
po/POTFILES.in | 1 +
src/Makefile.am | 2 +-
src/conf/capabilities.c | 113 +-
src/conf/capabilities.h | 4 +-
src/conf/domain_conf.c | 249 ++++
src/conf/domain_conf.h | 21 +
src/libvirt_private.syms | 24 +-
src/qemu/qemu_capabilities.c | 4 +-
src/qemu/qemu_process.c | 61 +-
src/util/virbitmap.c | 118 +-
src/util/virbitmap.h | 15 +-
src/util/virresctrl.c | 1317 ++++++++++++++++++--
src/util/virresctrl.h | 81 +-
src/util/virresctrlpriv.h | 32 +
src/util/virutil.c | 50 +
src/util/virutil.h | 3 +
tests/Makefile.am | 8 +-
.../genericxml2xmlindata/generic-cachetune-cdp.xml | 36 +
.../generic-cachetune-colliding-allocs.xml | 30 +
.../generic-cachetune-colliding-tunes.xml | 32 +
.../generic-cachetune-colliding-types.xml | 30 +
.../generic-cachetune-small.xml | 29 +
tests/genericxml2xmlindata/generic-cachetune.xml | 33 +
tests/genericxml2xmltest.c | 10 +
tests/testutils.c | 2 +-
tests/virbitmaptest.c | 84 +-
tests/vircaps2xmldata/linux-caches/system | 1 +
.../linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask | 0
.../resctrl/info/L3CODE/min_cbm_bits | 0
.../resctrl/info/L3CODE/num_closids | 0
.../linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask | 0
.../resctrl/info/L3DATA/min_cbm_bits | 0
.../resctrl/info/L3DATA/num_closids | 0
.../linux-resctrl-cdp/resctrl/schemata | 4 +-
.../resctrl/info/L3/cbm_mask | 1 +
.../resctrl/info/L3}/min_cbm_bits | 0
.../resctrl/info/L3/num_closids | 1 +
.../linux-resctrl-skx-twocaches/resctrl/schemata | 1 +
.../resctrl/some_reservation/schemata | 1 +
.../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 +
.../system/cpu/cpu0/cache/index1/id} | 0
.../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 +
.../system/cpu/cpu0/online} | 0
.../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-skx-twocaches/system/cpu/online | 1 +
.../linux-resctrl-skx-twocaches/system/cpu/present | 1 +
.../system/node/node0/cpu0 | 1 +
.../system/node/node0/cpulist | 1 +
.../system/node/node0/cpumap | 1 +
.../system/node/node0/distance | 1 +
.../linux-resctrl-skx-twocaches/system/node/online | 1 +
.../linux-resctrl-skx/resctrl/empty/schemata | 0
.../linux-resctrl-skx/resctrl/schemata | 2 +-
.../vircaps2xmldata/linux-resctrl/resctrl/schemata | 2 +-
tests/vircaps2xmldata/vircaps-x86_64-caches.xml | 2 +-
.../vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml | 4 +-
...ml => vircaps-x86_64-resctrl-skx-twocaches.xml} | 7 +-
.../vircaps2xmldata/vircaps-x86_64-resctrl-skx.xml | 4 +-
tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 4 +-
tests/vircaps2xmltest.c | 1 +
.../resctrl--cachetune/vcpus-0-1.alloc | 1 +
.../resctrl--cachetune/vcpus-3.alloc | 1 +
.../resctrl-cdp--cachetune-cdp/vcpus-0-1.alloc | 2 +
.../resctrl-cdp--cachetune-cdp/vcpus-2.alloc | 1 +
.../resctrl-cdp--cachetune-cdp/vcpus-3.alloc | 1 +
tests/virresctrldata/resctrl-cdp.schemata | 2 +
.../virresctrldata/resctrl-skx-twocaches.schemata | 1 +
tests/virresctrldata/resctrl-skx.schemata | 1 +
tests/virresctrldata/resctrl.schemata | 1 +
tests/virresctrltest.c | 277 ++++
tools/virsh-domain.c | 4 +-
tools/virsh-host.c | 2 +-
89 files changed, 2626 insertions(+), 183 deletions(-)
create mode 100644 src/util/virresctrlpriv.h
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-cdp.xml
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-allocs.xml
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-tunes.xml
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-colliding-types.xml
create mode 100644 tests/genericxml2xmlindata/generic-cachetune-small.xml
create mode 100644 tests/genericxml2xmlindata/generic-cachetune.xml
create mode 120000 tests/vircaps2xmldata/linux-caches/system
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/cbm_mask
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3CODE/num_closids
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/cbm_mask
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/min_cbm_bits
mode change 100755 => 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/info/L3DATA/num_closids
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE => linux-resctrl-skx-twocaches/resctrl/info/L3}/min_cbm_bits (100%)
mode change 100755 => 100644
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits => linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id} (100%)
mode change 100755 => 100644
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
copy tests/vircaps2xmldata/{linux-resctrl-cdp/resctrl/info/L3CODE/min_cbm_bits => linux-resctrl-skx-twocaches/system/cpu/cpu0/online} (100%)
mode change 100755 => 100644
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
create mode 120000 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/resctrl/empty/schemata
copy tests/vircaps2xmldata/{vircaps-x86_64-resctrl-skx.xml => vircaps-x86_64-resctrl-skx-twocaches.xml} (68%)
create mode 100644 tests/virresctrldata/resctrl--cachetune/vcpus-0-1.alloc
create mode 100644 tests/virresctrldata/resctrl--cachetune/vcpus-3.alloc
create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-0-1.alloc
create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-2.alloc
create mode 100644 tests/virresctrldata/resctrl-cdp--cachetune-cdp/vcpus-3.alloc
create mode 100644 tests/virresctrldata/resctrl-cdp.schemata
create mode 100644 tests/virresctrldata/resctrl-skx-twocaches.schemata
create mode 100644 tests/virresctrldata/resctrl-skx.schemata
create mode 100644 tests/virresctrldata/resctrl.schemata
create mode 100644 tests/virresctrltest.c
--
2.15.0
7 years, 1 month
- 3
- 57
[libvirt] [PATCH v4 1/2] remote: Extract common clearing of event callbacks of client private data
by xinhua.Cao
Extract common clearing of event callbacks as remoteClientFreePrivateCallbacks.
the common function also separation including the sysident handling.
---
daemon/remote.c | 73 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 39 insertions(+), 34 deletions(-)
diff --git a/daemon/remote.c b/daemon/remote.c
index cbcb6e8..2dcec1e 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1689,6 +1689,44 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r
neventCallbacks = 0; \
} while (0);
+
+static void
+remoteClientFreePrivateCallbacks(struct daemonClientPrivate *priv)
+{
+ virIdentityPtr sysident = virIdentityGetSystem();
+ virIdentitySetCurrent(sysident);
+
+ DEREG_CB(priv->conn, priv->domainEventCallbacks,
+ priv->ndomainEventCallbacks,
+ virConnectDomainEventDeregisterAny, "domain");
+ DEREG_CB(priv->conn, priv->networkEventCallbacks,
+ priv->nnetworkEventCallbacks,
+ virConnectNetworkEventDeregisterAny, "network");
+ DEREG_CB(priv->conn, priv->storageEventCallbacks,
+ priv->nstorageEventCallbacks,
+ virConnectStoragePoolEventDeregisterAny, "storage");
+ DEREG_CB(priv->conn, priv->nodeDeviceEventCallbacks,
+ priv->nnodeDeviceEventCallbacks,
+ virConnectNodeDeviceEventDeregisterAny, "node device");
+ DEREG_CB(priv->conn, priv->secretEventCallbacks,
+ priv->nsecretEventCallbacks,
+ virConnectSecretEventDeregisterAny, "secret");
+ DEREG_CB(priv->conn, priv->qemuEventCallbacks,
+ priv->nqemuEventCallbacks,
+ virConnectDomainQemuMonitorEventDeregister, "qemu monitor");
+
+ if (priv->closeRegistered) {
+ if (virConnectUnregisterCloseCallback(priv->conn,
+ remoteRelayConnectionClosedEvent) < 0)
+ VIR_WARN("unexpected close callback event deregister failure");
+ }
+
+ virIdentitySetCurrent(NULL);
+ virObjectUnref(sysident);
+}
+#undef DEREG_CB
+
+
/*
* You must hold lock for at least the client
* We don't free stuff here, merely disconnect the client's
@@ -1702,44 +1740,11 @@ void remoteClientFreeFunc(void *data)
/* Deregister event delivery callback */
if (priv->conn) {
- virIdentityPtr sysident = virIdentityGetSystem();
-
- virIdentitySetCurrent(sysident);
-
- DEREG_CB(priv->conn, priv->domainEventCallbacks,
- priv->ndomainEventCallbacks,
- virConnectDomainEventDeregisterAny, "domain");
- DEREG_CB(priv->conn, priv->networkEventCallbacks,
- priv->nnetworkEventCallbacks,
- virConnectNetworkEventDeregisterAny, "network");
- DEREG_CB(priv->conn, priv->storageEventCallbacks,
- priv->nstorageEventCallbacks,
- virConnectStoragePoolEventDeregisterAny, "storage");
- DEREG_CB(priv->conn, priv->nodeDeviceEventCallbacks,
- priv->nnodeDeviceEventCallbacks,
- virConnectNodeDeviceEventDeregisterAny, "node device");
- DEREG_CB(priv->conn, priv->secretEventCallbacks,
- priv->nsecretEventCallbacks,
- virConnectSecretEventDeregisterAny, "secret");
- DEREG_CB(priv->conn, priv->qemuEventCallbacks,
- priv->nqemuEventCallbacks,
- virConnectDomainQemuMonitorEventDeregister, "qemu monitor");
-
- if (priv->closeRegistered) {
- if (virConnectUnregisterCloseCallback(priv->conn,
- remoteRelayConnectionClosedEvent) < 0)
- VIR_WARN("unexpected close callback event deregister failure");
- }
-
+ remoteClientFreePrivateCallbacks(priv);
virConnectClose(priv->conn);
-
- virIdentitySetCurrent(NULL);
- virObjectUnref(sysident);
}
-
VIR_FREE(priv);
}
-#undef DEREG_CB
static void remoteClientCloseFunc(virNetServerClientPtr client)
--
2.8.3
7 years, 1 month
- 3
- 5
[libvirt] [PATCH v2 00/10] Implement query-dump command
by John Ferlan
v1: https://www.redhat.com/archives/libvir-list/2017-November/msg00731.html
Differences from v1 (besides more patches)
Rather than use a timing loop in order to fetch the dump stats and
the presence of the 'query-dump' command, let's use the DUMP_COMPLETED
event and wire that up in order to determine when the dump has been
completed. In the mean time, the previous timing loop is converted into
a qemuDomainGetJobInfoDumpStats to be called if the "right conditions"
exist. Also found/fixed a couple of minor issues from v1 regarding
usage "dumpformat" instead of just "format" from my patch 2 adjustment
and a type for qemuMonitorDumpStatus (was qemuMontiorDumpStatus in v1).
NB: (from v1 cover):
Details in the patches. Essentially though QEMU 2.6 added the ability
to perform the 'dump-guest-memory' via a thread by adding a 'detach'
boolean to the command. In order to watch the progress of the thread
the 'query-dump' command was added. The query-dump will return just
the current status, the total size to be dumped, and the current
progress. So using the migrate stats data in the DomainJobInfo we
can then save our current progress allowing tools such as virsh to
watch that progress. As an added benefit, the dump-guest-memory is
now truly asynchronous.
John Ferlan (10):
qemu: Clean up style for the qemuDumpToFd definition
qemu: Alter dump-guest-memory command generation
qemu: Add support for DUMP_COMPLETED event
qemu: Introduce qemuProcessHandleDumpCompleted
qemu: Introduce qemuMonitor[JSON]QueryDump
qemu: Add new parameter to qemuMonitorDumpToFd
qemu: Introduce qemuDomainGetJobInfoMigrationStats
qemu: Introduce qemuDomainGetJobInfoDumpStats
qemu: Add dump completed event to the capabilities
qemu: Allow showing the dump progress for memory only dump
src/qemu/qemu_capabilities.c | 2 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_domain.c | 2 +
src/qemu/qemu_domain.h | 2 +
src/qemu/qemu_driver.c | 157 ++++++++++++++++++---
src/qemu/qemu_monitor.c | 39 ++++-
src/qemu/qemu_monitor.h | 33 ++++-
src/qemu/qemu_monitor_json.c | 122 ++++++++++++++--
src/qemu/qemu_monitor_json.h | 7 +-
src/qemu/qemu_process.c | 23 +++
.../caps_2.10.0-gicv2.aarch64.xml | 1 +
.../caps_2.10.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 +
.../caps_2.6.0-gicv2.aarch64.xml | 1 +
.../caps_2.6.0-gicv3.aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 +
tests/qemumonitorjsontest.c | 3 +-
27 files changed, 365 insertions(+), 42 deletions(-)
--
2.13.6
7 years, 1 month
- 1
- 10