- Devel - libvirt List Archives

[libvirt] [PATCH] Fix include for xattr.h
by Martin Kletzander 06 Aug '18

06 Aug '18

The proper file that should be included is `sys/xattr.h` as that comes from `glibc` and not `attr/xattr.h` which ships with the `attr` utility. We're most probably not the only ones because `attr/xattr.h` added a #warning to their include resulting in the following compilation errors: In file included from securityselinuxlabeltest.c:31:0: /usr/include/attr/xattr.h:5:2: error: #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" [-Werror=cpp] #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" ^~~~~~~ In file included from securityselinuxhelper.c:37:0: /usr/include/attr/xattr.h:5:2: error: #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" [-Werror=cpp] #warning "Please change your <attr/xattr.h> includes to <sys/xattr.h>" ^~~~~~~ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Not pushing as build-breaker because we are still in freeze and I'd still like someone with SELinux to check this patch. My VM with such system stopped working just now =( m4/virt-attr.m4 | 2 +- tests/securityselinuxhelper.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/virt-attr.m4 b/m4/virt-attr.m4 index c55bd7dbd823..478549c17f12 100644 --- a/m4/virt-attr.m4 +++ b/m4/virt-attr.m4 @@ -5,7 +5,7 @@ AC_DEFUN([LIBVIRT_ARG_ATTR],[ ]) AC_DEFUN([LIBVIRT_CHECK_ATTR],[ - LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [attr/xattr.h]) + LIBVIRT_CHECK_LIB([ATTR], [attr], [getxattr], [sys/xattr.h]) ]) AC_DEFUN([LIBVIRT_RESULT_ATTR],[ diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 22b6709554b4..fe6f2b5fd9b0 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -34,7 +34,7 @@ #include <string.h> #include <sys/vfs.h> #include <unistd.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #ifndef NFS_SUPER_MAGIC # define NFS_SUPER_MAGIC 0x6969 diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index c684989fd26e..48fee7cd285b 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -28,7 +28,7 @@ #include <selinux/selinux.h> #include <selinux/context.h> -#include <attr/xattr.h> +#include <sys/xattr.h> #include "internal.h" #include "testutils.h" -- 2.18.0

2 1

[libvirt] [PATCH] virrandom: Avoid undefined behaviour in virRandomBits
by Michal Privoznik 06 Aug '18

06 Aug '18

If nbits is 64 (or greater) then shifting 1ULL left is undefined. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virrandom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 3c011a8615..7915f6531e 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -68,7 +68,9 @@ uint64_t virRandomBits(int nbits) return 0; } - ret &= (1ULL << nbits) - 1; + if (nbits < 64) + ret &= (1ULL << nbits) - 1; + return ret; } -- 2.16.4

2 1

[libvirt] [PATCH] remote: daemon: Make sure that JSON symbols are properly loaded at startup
by Peter Krempa 06 Aug '18

06 Aug '18

Explicitly call virJSONInitialize at startup of the libvirt daemon so that we are sure that the symbols in the compat library are properly loaded. This will prevent any random failure from happening later on when the daemon would want to use the JSON parser. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/libvirt_private.syms | 4 ++++ src/remote/remote_daemon.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fc386e1699..70dfcc5e29 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2135,6 +2135,10 @@ virJSONValueObjectStealObject; virJSONValueToString; +# util/virjsoncompat.h +virJSONInitialize; + + # util/virkeycode.h virKeycodeSetTypeFromString; virKeycodeSetTypeToString; diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 9f3a5f38ad..8bbc3818bb 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -59,6 +59,7 @@ #include "virutil.h" #include "virgettext.h" #include "util/virnetdevopenvswitch.h" +#include "virjsoncompat.h" #include "driver.h" @@ -1183,6 +1184,9 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + if (virJSONInitialize() < 0) + exit(EXIT_FAILURE); + daemonSetupNetDevOpenvswitch(config); if (daemonSetupAccessManager(config) < 0) { -- 2.16.2

2 1

[libvirt] [PATCH 0/3] conf: standardize naming
by Anya Harter 03 Aug '18

03 Aug '18

on vir*ObjListExport call stack Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions src/conf/virinterfaceobj.c | 10 +++++----- src/conf/virnetworkobj.c | 16 ++++++++-------- src/conf/virnodedeviceobj.c | 4 ++-- src/conf/virsecretobj.c | 10 +++++----- src/conf/virstorageobj.c | 24 ++++++++++++------------ 5 files changed, 32 insertions(+), 32 deletions(-) -- 2.17.1

2 6

[libvirt] [PATCH] tests: Unify data structure for vircaps2xmltest
by Andrea Bolognani 03 Aug '18

03 Aug '18

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

2 1

[libvirt] [PATCH v2 0/2] ESX: Fixing SetAutoStart
by Marcos Paulo de Souza 02 Aug '18

02 Aug '18

This is a new version from the last patchset sent yesterday, but now using VIR_STRNDUP, instead of allocating memory manually. First version: https://www.redhat.com/archives/libvir-list/2018-August/msg00000.html Marcos Paulo de Souza (2): esx: Do not crash SetAutoStart by double free esx: Fix SetAutoStart invalid pointer free src/esx/esx_driver.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 2.17.1

3 11

[libvirt] Entering freeze for libvirt-4.6.0
by Daniel Veillard 02 Aug '18

02 Aug '18

As suggested yesterday, I have just tagged the release candidate 1 in git, and pushed signed tarbal and rpms to the usual place: ftp://libvirt.org/libvirt/ seems to work fine with my limited testing, and https://ci.centos.org/view/libvirt/ is all green (except for virt-viewer-master-rpm ?) so things looks pretty good for me but please try it out on different systems and OSes. If everything goes well I will push rc2 on Tuesday targetting Thursday for the final release (or Friday if I get stuck in travels). thanks in advance for trying it out ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

11 31

[libvirt] [PATCH] tests: mock virRandomBits to make it endian stable
by Daniel P. Berrangé 02 Aug '18

02 Aug '18

virRandomBits is implemented in terms of virRandomBytes. Although we mock virRandomBytes to give a stable value, this is not sufficient to make virRandomBits give a stable value. The result of virRandomBits will vary depending on endianness. Thus we mock virRandomBits to return a stable value directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virrandommock.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 99a55a576a..3079b8bacb 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -44,6 +44,14 @@ virRandomBytes(unsigned char *buf, return 0; } +uint64_t virRandomBits(int nbits) +{ + /* Chosen by a fair roll of a 2^64 sided dice */ + uint64_t ret = 0x0706050403020100; + if (nbits < 64) + ret &= ((1ULL << nbits) - 1); + return ret; +} int virRandomGenerateWWN(char **wwn, const char *virt_type ATTRIBUTE_UNUSED) -- 2.17.1

3 3

[libvirt] [PATCH] storage: add findPoolSources to iscsi_direct pool backend
by clem＠lse.epita.fr 02 Aug '18

02 Aug '18

From: Clementine Hayat <clem(a)lse.epita.fr> Change the SetContext function to be able to take the session type in argument. Took the function findPoolSources of iscsi backend and wired it to my function since the formatting is essentially the same. Signed-off-by: Clementine Hayat <clem(a)lse.epita.fr> --- src/storage/storage_backend_iscsi_direct.c | 179 ++++++++++++++++++++- 1 file changed, 171 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c index ab192730fb..fc30f2dfac 100644 --- a/src/storage/storage_backend_iscsi_direct.c +++ b/src/storage/storage_backend_iscsi_direct.c @@ -131,7 +131,8 @@ virStorageBackendISCSIDirectSetAuth(struct iscsi_context *iscsi, static int virISCSIDirectSetContext(struct iscsi_context *iscsi, - const char *target_name) + const char *target_name, + enum iscsi_session_type session) { if (iscsi_init_transport(iscsi, TCP_TRANSPORT) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -139,13 +140,15 @@ virISCSIDirectSetContext(struct iscsi_context *iscsi, iscsi_get_error(iscsi)); return -1; } - if (iscsi_set_targetname(iscsi, target_name) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to set target name: %s"), - iscsi_get_error(iscsi)); - return -1; + if (session == ISCSI_SESSION_NORMAL) { + if (iscsi_set_targetname(iscsi, target_name) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to set target name: %s"), + iscsi_get_error(iscsi)); + return -1; + } } - if (iscsi_set_session_type(iscsi, ISCSI_SESSION_NORMAL) < 0) { + if (iscsi_set_session_type(iscsi, session) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to set session type: %s"), iscsi_get_error(iscsi)); @@ -400,6 +403,92 @@ virISCSIDirectDisconnect(struct iscsi_context *iscsi) return 0; } +static void +virFreeTargets(char **targets, size_t ntargets, char *target) +{ + size_t i; + + VIR_FREE(target); + for (i = 0; i < ntargets; i++) + VIR_FREE(targets[i]); + VIR_FREE(targets); +} + +static int +virISCSIDirectUpdateTargets(struct iscsi_context *iscsi, + size_t *ntargets, + char ***targets) +{ + int ret = -1; + struct iscsi_discovery_address *addr; + struct iscsi_discovery_address *tmp_addr; + size_t tmp_ntargets = 0; + char **tmp_targets = NULL; + + if (!(addr = iscsi_discovery_sync(iscsi))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to discover session: %s"), + iscsi_get_error(iscsi)); + return ret; + } + *ntargets = 0; + for (tmp_addr = addr; tmp_addr; tmp_addr = tmp_addr->next) { + char *target = NULL; + if (VIR_STRDUP(target, tmp_addr->target_name) < 0) { + virFreeTargets(tmp_targets, tmp_ntargets, NULL); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to allocate memory for: %s"), + tmp_addr->target_name); + goto cleanup; + } + + if (VIR_APPEND_ELEMENT(tmp_targets, tmp_ntargets, target) < 0) { + virFreeTargets(tmp_targets, tmp_ntargets, target); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to append to the list element: %s"), + tmp_addr->target_name); + goto cleanup; + } + + } + + if (tmp_ntargets) { + *targets = tmp_targets; + *ntargets = tmp_ntargets; + } + + ret = 0; + cleanup: + iscsi_free_discovery_data(iscsi, addr); + return ret; +} + +static int +virISCSIDirectScanTargets(char *initiator_iqn, + char *portal, + size_t *ntargets, + char ***targets) +{ + struct iscsi_context *iscsi = NULL; + int ret = -1; + + if (!(iscsi = virISCSIDirectCreateContext(initiator_iqn))) + goto cleanup; + if (virISCSIDirectSetContext(iscsi, NULL, ISCSI_SESSION_DISCOVERY) < 0) + goto cleanup; + if (virISCSIDirectConnect(iscsi, portal) < 0) + goto cleanup; + if (virISCSIDirectUpdateTargets(iscsi, ntargets, targets) < 0) + goto disconnect; + + ret = 0; + disconnect: + virISCSIDirectDisconnect(iscsi); + cleanup: + iscsi_destroy_context(iscsi); + return ret; +} + static int virStorageBackendISCSIDirectCheckPool(virStoragePoolObjPtr pool, bool *isActive) @@ -408,6 +497,79 @@ virStorageBackendISCSIDirectCheckPool(virStoragePoolObjPtr pool, return 0; } +static char * +virStorageBackendISCSIDirectFindPoolSources(const char *srcSpec, + unsigned int flags) +{ + virStoragePoolSourcePtr source = NULL; + size_t ntargets = 0; + char **targets = NULL; + char *ret = NULL; + size_t i; + virStoragePoolSourceList list = { + .type = VIR_STORAGE_POOL_ISCSI_DIRECT, + .nsources = 0, + .sources = NULL + }; + char *portal = NULL; + + virCheckFlags(0, NULL); + + if (!srcSpec) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("hostname must be specified for iscsi sources")); + return NULL; + } + + if (!(source = virStoragePoolDefParseSourceString(srcSpec, list.type))) + return NULL; + + if (source->nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + if (!(portal = virStorageBackendISCSIDirectPortal(source))) + goto cleanup; + + if (virISCSIDirectScanTargets(source->initiator.iqn, portal, &ntargets, &targets) < 0) + goto cleanup; + + if (VIR_ALLOC_N(list.sources, ntargets) < 0) + goto cleanup; + + for (i = 0; i < ntargets; i++) { + if (VIR_ALLOC_N(list.sources[i].devices, 1) < 0 || + VIR_ALLOC_N(list.sources[i].hosts, 1) < 0) + goto cleanup; + list.sources[i].nhost = 1; + list.sources[i].hosts[0] = source->hosts[0]; + list.sources[i].initiator = source->initiator; + list.sources[i].ndevice = 1; + list.sources[i].devices[0].path = targets[i]; + list.nsources++; + } + + if (!(ret = virStoragePoolSourceListFormat(&list))) + goto cleanup; + + cleanup: + if (list.sources) { + for (i = 0; i < ntargets; i++) { + VIR_FREE(list.sources[i].hosts); + VIR_FREE(list.sources[i].devices); + } + VIR_FREE(list.sources); + } + for (i = 0; i < ntargets; i++) + VIR_FREE(targets[i]); + VIR_FREE(targets); + VIR_FREE(portal); + virStoragePoolSourceFree(source); + return ret; +} + static int virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) { @@ -422,7 +584,7 @@ virStorageBackendISCSIDirectRefreshPool(virStoragePoolObjPtr pool) goto cleanup; if (virStorageBackendISCSIDirectSetAuth(iscsi, &def->source) < 0) goto cleanup; - if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path) < 0) + if (virISCSIDirectSetContext(iscsi, def->source.devices[0].path, ISCSI_SESSION_NORMAL) < 0) goto cleanup; if (virISCSIDirectConnect(iscsi, portal) < 0) goto cleanup; @@ -442,6 +604,7 @@ virStorageBackend virStorageBackendISCSIDirect = { .type = VIR_STORAGE_POOL_ISCSI_DIRECT, .checkPool = virStorageBackendISCSIDirectCheckPool, + .findPoolSources = virStorageBackendISCSIDirectFindPoolSources, .refreshPool = virStorageBackendISCSIDirectRefreshPool, }; -- 2.18.0

3 2

[libvirt] [PATCH] util: virrandom: make virRandomBits endian-safe
by Bjoern Walk 02 Aug '18

02 Aug '18

Make the generation of random bits in virRandomBits independent of the endianness of the running architecture. This also solves problems with the mocked random byte generation on big-endian machines. Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- This goes on top of Michal's fix: https://www.redhat.com/archives/libvir-list/2018-August/msg00080.html src/util/virrandom.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 7915f653..26ff68f5 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -34,6 +34,7 @@ # include <gnutls/crypto.h> #endif +#include "virendian.h" #include "virrandom.h" #include "virthread.h" #include "count-one-bits.h" @@ -61,13 +62,16 @@ VIR_LOG_INIT("util.random"); uint64_t virRandomBits(int nbits) { uint64_t ret = 0; + uint8_t val[8]; - if (virRandomBytes((unsigned char *) &ret, sizeof(ret)) < 0) { + if (virRandomBytes((unsigned char *) &val, sizeof(val)) < 0) { /* You're already hosed, so this particular non-random value * isn't any worse. */ return 0; } + ret = virReadBufInt64LE(val); + if (nbits < 64) ret &= (1ULL << nbits) - 1; -- 2.17.0

3 5