[libvirt] [PATCH] tests: Unify data structure for vircaps2xmltest
by Andrea Bolognani
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
6 years, 3 months
- 2
- 1
[libvirt] [PATCH v2 0/2] ESX: Fixing SetAutoStart
by Marcos Paulo de Souza
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
6 years, 3 months
- 3
- 11
[libvirt] Entering freeze for libvirt-4.6.0
by Daniel Veillard
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/
6 years, 3 months
- 11
- 31
[libvirt] [PATCH] tests: mock virRandomBits to make it endian stable
by Daniel P. Berrangé
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
6 years, 3 months
- 3
- 3
[libvirt] [PATCH] storage: add findPoolSources to iscsi_direct pool backend
by clem＠lse.epita.fr
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
6 years, 3 months
- 3
- 2
[libvirt] [PATCH] util: virrandom: make virRandomBits endian-safe
by Bjoern Walk
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
6 years, 3 months
- 3
- 5
[libvirt] [PATCH] tests: fix test segfault when libxl configuration setup fails.
by Julio Faracco
This commit fixes a segmentation fault caused by missing conditional to
check if libxl configuration was properly created by the test. If the
configuration was not properly created, libxlDriverConfigNew() function
will return NULL and cause a segfault at cfg->caps = NULL during the
cleanup.
Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com>
---
tests/libxlxml2domconfigtest.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 34a63e22b5..a9758c40cb 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -138,7 +138,8 @@ testCompareXMLToDomConfig(const char *xmlfile,
libxl_domain_config_dispose(&actualconfig);
libxl_domain_config_dispose(&expectconfig);
xtl_logger_destroy(log);
- cfg->caps = NULL;
+ if (cfg)
+ cfg->caps = NULL;
virObjectUnref(cfg);
return ret;
}
--
2.17.1
6 years, 3 months
- 2
- 2
[libvirt] [PATCH for-3.1] s390x: remove 's390-squash-mcss' option
by Cornelia Huck
This option has been deprecated for two releases; remove it.
Signed-off-by: Cornelia Huck <cohuck(a)redhat.com>
---
hw/s390x/3270-ccw.c | 2 +-
hw/s390x/css-bridge.c | 1 -
hw/s390x/css.c | 6 ++----
hw/s390x/s390-ccw.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 37 ++-----------------------------------
hw/s390x/virtio-ccw.c | 2 +-
include/hw/s390x/css-bridge.h | 1 -
include/hw/s390x/css.h | 9 +++------
include/hw/s390x/s390-virtio-ccw.h | 1 -
qemu-deprecated.texi | 8 --------
qemu-options.hx | 10 ----------
target/s390x/cpu.c | 10 ----------
target/s390x/cpu.h | 1 -
13 files changed, 10 insertions(+), 80 deletions(-)
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c
index 3af13ea027..cf58b81fc0 100644
--- a/hw/s390x/3270-ccw.c
+++ b/hw/s390x/3270-ccw.c
@@ -104,7 +104,7 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp)
SubchDev *sch;
Error *err = NULL;
- sch = css_create_sch(cdev->devno, cbus->squash_mcss, errp);
+ sch = css_create_sch(cdev->devno, errp);
if (!sch) {
return;
}
diff --git a/hw/s390x/css-bridge.c b/hw/s390x/css-bridge.c
index a02d708239..1bd6c8b458 100644
--- a/hw/s390x/css-bridge.c
+++ b/hw/s390x/css-bridge.c
@@ -106,7 +106,6 @@ VirtualCssBus *virtual_css_bus_init(void)
/* Create bus on bridge device */
bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");
cbus = VIRTUAL_CSS_BUS(bus);
- cbus->squash_mcss = s390_get_squash_mcss();
/* Enable hotplugging */
qbus_set_hotplug_handler(bus, dev, &error_abort);
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 5424ea4562..5a9fe45ce8 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -2359,15 +2359,13 @@ const PropertyInfo css_devid_ro_propinfo = {
.get = get_css_devid,
};
-SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp)
+SubchDev *css_create_sch(CssDevId bus_id, Error **errp)
{
uint16_t schid = 0;
SubchDev *sch;
if (bus_id.valid) {
- if (squash_mcss) {
- bus_id.cssid = channel_subsys.default_cssid;
- } else if (!channel_subsys.css[bus_id.cssid]) {
+ if (!channel_subsys.css[bus_id.cssid]) {
css_create_css_image(bus_id.cssid, false);
}
diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index 214c940593..d1280bf631 100644
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -78,7 +78,7 @@ static void s390_ccw_realize(S390CCWDevice *cdev, char *sysfsdev, Error **errp)
goto out_err_propagate;
}
- sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, &err);
+ sch = css_create_sch(ccw_dev->devno, &err);
if (!sch) {
goto out_mdevid_free;
}
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 7983185d04..380a41d806 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -282,19 +282,8 @@ static void ccw_init(MachineState *machine)
virtio_ccw_register_hcalls();
s390_enable_css_support(s390_cpu_addr2state(0));
- /*
- * Non mcss-e enabled guests only see the devices from the default
- * css, which is determined by the value of the squash_mcss property.
- */
- if (css_bus->squash_mcss) {
- ret = css_create_css_image(0, true);
- } else {
- ret = css_create_css_image(VIRTUAL_CSSID, true);
- }
- if (qemu_opt_get(qemu_get_machine_opts(), "s390-squash-mcss")) {
- warn_report("The machine property 's390-squash-mcss' is deprecated"
- " (obsoleted by lifting the cssid restrictions).");
- }
+
+ ret = css_create_css_image(VIRTUAL_CSSID, true);
assert(ret == 0);
if (css_migration_enabled()) {
@@ -575,21 +564,6 @@ static void machine_set_loadparm(Object *obj, const char *val, Error **errp)
ms->loadparm[i] = ' '; /* pad right with spaces */
}
}
-static inline bool machine_get_squash_mcss(Object *obj, Error **errp)
-{
- S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
-
- return ms->s390_squash_mcss;
-}
-
-static inline void machine_set_squash_mcss(Object *obj, bool value,
- Error **errp)
-{
- S390CcwMachineState *ms = S390_CCW_MACHINE(obj);
-
- ms->s390_squash_mcss = value;
-}
-
static inline void s390_machine_initfn(Object *obj)
{
object_property_add_bool(obj, "aes-key-wrap",
@@ -614,13 +588,6 @@ static inline void s390_machine_initfn(Object *obj)
" to upper case) to pass to machine loader, boot manager,"
" and guest kernel",
NULL);
- object_property_add_bool(obj, "s390-squash-mcss",
- machine_get_squash_mcss,
- machine_set_squash_mcss, NULL);
- object_property_set_description(obj, "s390-squash-mcss", "(deprecated) "
- "enable/disable squashing subchannels into the default css",
- NULL);
- object_property_set_bool(obj, false, "s390-squash-mcss", NULL);
}
static const TypeInfo ccw_machine_info = {
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 7ddb378d52..3156e8d6e1 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -700,7 +700,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *dev, Error **errp)
SubchDev *sch;
Error *err = NULL;
- sch = css_create_sch(ccw_dev->devno, cbus->squash_mcss, errp);
+ sch = css_create_sch(ccw_dev->devno, errp);
if (!sch) {
return;
}
diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h
index cf0860432a..5a0203be5f 100644
--- a/include/hw/s390x/css-bridge.h
+++ b/include/hw/s390x/css-bridge.h
@@ -28,7 +28,6 @@ typedef struct VirtualCssBridge {
/* virtual css bus type */
typedef struct VirtualCssBus {
BusState parent_obj;
- bool squash_mcss;
} VirtualCssBus;
#define TYPE_VIRTUAL_CSS_BUS "virtual-css-bus"
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index 35facb47d2..9da5912921 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -266,11 +266,8 @@ extern const PropertyInfo css_devid_ro_propinfo;
/**
* Create a subchannel for the given bus id.
*
- * If @p bus_id is valid, and @p squash_mcss is true, verify that it is
- * not already in use in the default css, and find a free devno from the
- * default css image for it.
- * If @p bus_id is valid, and @p squash_mcss is false, verify that it is
- * not already in use, and find a free devno for it.
+ * If @p bus_id is valid, verify that it is not already in use, and find a
+ * free devno for it.
* If @p bus_id is not valid find a free subchannel id and device number
* across all subchannel sets and all css images starting from the default
* css image.
@@ -282,7 +279,7 @@ extern const PropertyInfo css_devid_ro_propinfo;
* The caller becomes owner of the returned subchannel structure and
* is responsible for unregistering and freeing it.
*/
-SubchDev *css_create_sch(CssDevId bus_id, bool squash_mcss, Error **errp);
+SubchDev *css_create_sch(CssDevId bus_id, Error **errp);
/** Turn on css migration */
void css_register_vmstate(void);
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h
index ab88d49d10..e9c4f4182b 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -29,7 +29,6 @@ typedef struct S390CcwMachineState {
bool aes_key_wrap;
bool dea_key_wrap;
uint8_t loadparm[8];
- bool s390_squash_mcss;
} S390CcwMachineState;
typedef struct S390CcwMachineClass {
diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi
index 9920a85adc..09f7b22fb1 100644
--- a/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@ -126,14 +126,6 @@ The ``-nodefconfig`` argument is a synonym for ``-no-user-config``.
The @option{--balloon virtio} argument has been superseded by
@option{--device virtio-balloon}.
-@subsection -machine s390-squash-mcss=on|off (since 2.12.0)
-
-The ``s390-squash-mcss=on`` property has been obsoleted by allowing the
-cssid to be chosen freely. Instead of squashing subchannels into the
-default channel subsystem image for guests that do not support multiple
-channel subsystems, all devices can be put into the default channel
-subsystem image.
-
@subsection -fsdev handle (since 2.12.0)
The ``handle'' fsdev backend does not support symlinks and causes the 9p
diff --git a/qemu-options.hx b/qemu-options.hx
index b1bf0f485f..e57cec96a5 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -43,7 +43,6 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \
" suppress-vmdesc=on|off disables self-describing migration (default=off)\n"
" nvdimm=on|off controls NVDIMM support (default=off)\n"
" enforce-config-section=on|off enforce configuration section migration (default=off)\n"
- " s390-squash-mcss=on|off (deprecated) controls support for squashing into default css (default=off)\n"
" memory-encryption=@var{} memory encryption object to use (default=none)\n",
QEMU_ARCH_ALL)
STEXI
@@ -96,15 +95,6 @@ controls whether DEA wrapping keys will be created to allow
execution of DEA cryptographic functions. The default is on.
@item nvdimm=on|off
Enables or disables NVDIMM support. The default is off.
-@item s390-squash-mcss=on|off
-Enables or disables squashing subchannels into the default css.
-The default is off.
-NOTE: This property is deprecated and will be removed in future releases.
-The ``s390-squash-mcss=on`` property has been obsoleted by allowing the
-cssid to be chosen freely. Instead of squashing subchannels into the
-default channel subsystem image for guests that do not support multiple
-channel subsystems, all devices can be put into the default channel
-subsystem image.
@item enforce-config-section=on|off
If @option{enforce-config-section} is set to @var{on}, force migration
code to send configuration section even if the machine-type sets the
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 271c5ce652..8ed4823d6e 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -421,16 +421,6 @@ void s390_crypto_reset(void)
}
}
-bool s390_get_squash_mcss(void)
-{
- if (object_property_get_bool(OBJECT(qdev_get_machine()), "s390-squash-mcss",
- NULL)) {
- return true;
- }
-
- return false;
-}
-
void s390_enable_css_support(S390CPU *cpu)
{
if (kvm_enabled()) {
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 2c3dd2d189..86b66dfeac 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -713,7 +713,6 @@ static inline void s390_do_cpu_load_normal(CPUState *cs, run_on_cpu_data arg)
/* cpu.c */
void s390_crypto_reset(void);
-bool s390_get_squash_mcss(void);
int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit);
void s390_cmma_reset(void);
void s390_enable_css_support(S390CPU *cpu);
--
2.14.4
6 years, 3 months
- 6
- 14
[libvirt] [PATCH for v4.6.0 0/2] Fix some random problems
by Michal Privoznik
Bad pun. But while debugging the issue Bjoern raised [1] I've noticed
these problems.
https://www.redhat.com/archives/libvir-list/2018-July/msg02101.html
Michal Prívozník (2):
util: Don't overflow in virRandomBits
viriscsi: Request more random bits for interface name
src/util/viriscsi.c | 2 +-
src/util/virrandom.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
2.16.4
6 years, 3 months
- 5
- 15
[libvirt] [jenkins-ci PATCH 0/8] lcitool: Cleanups and improvements
by Andrea Bolognani
This series makes the guests/ directory less crowded by moving
a bunch of files to subdirectories, enhances the lcitool script
so that it works when called from any directory, and introduces
the ability to skip installation of build dependencies for
projects you don't care about. Some of these changes pave the
way for introducing [secret feature redacted] later on.
Andrea Bolognani (8):
lcitool: Make the script location-independent
lcitool: Use JSON to pass extra-vars
lcitool: Pass base and playbook_base to Ansible
guests: Move update playbook and related resources
guests: Drop install_config from inventory
guests: Move install configs
lcitool: Allow installing a subset of build dependencies
guests: Update documentation
guests/README.markdown | 38 ++++++--
guests/{ => configs}/kickstart.cfg | 0
guests/{ => configs}/preseed.cfg | 0
guests/host_vars/libvirt-centos-7/install.yml | 1 -
guests/host_vars/libvirt-debian-8/install.yml | 1 -
guests/host_vars/libvirt-debian-9/install.yml | 1 -
.../host_vars/libvirt-debian-sid/install.yml | 1 -
.../host_vars/libvirt-fedora-27/install.yml | 1 -
.../host_vars/libvirt-fedora-28/install.yml | 1 -
.../libvirt-fedora-rawhide/install.yml | 1 -
.../host_vars/libvirt-ubuntu-16/install.yml | 1 -
.../host_vars/libvirt-ubuntu-18/install.yml | 1 -
guests/lcitool | 96 ++++++++++++++-----
.../{site.yml => playbooks/update/main.yml} | 30 +++---
guests/{ => playbooks/update}/tasks/base.yml | 6 +-
.../update}/tasks/bootloader.yml | 0
.../update}/tasks/bootstrap.yml | 0
.../{ => playbooks/update}/tasks/jenkins.yml | 4 +-
.../{ => playbooks/update}/tasks/kludges.yml | 0
.../{ => playbooks/update}/tasks/packages.yml | 2 +-
guests/{ => playbooks/update}/tasks/paths.yml | 0
.../{ => playbooks/update}/tasks/services.yml | 0
guests/{ => playbooks/update}/tasks/users.yml | 4 +-
.../update}/templates/bash_profile.j2 | 0
.../update}/templates/bashrc.j2 | 0
.../update}/templates/ccache.conf.j2 | 0
.../fedora-rawhide-kernel-nodebug.repo.j2 | 0
.../update}/templates/jenkins.service.j2 | 0
.../templates/jessie-backports.preferences.j2 | 0
.../templates/jessie-backports.sources.j2 | 0
30 files changed, 128 insertions(+), 61 deletions(-)
rename guests/{ => configs}/kickstart.cfg (100%)
rename guests/{ => configs}/preseed.cfg (100%)
rename guests/{site.yml => playbooks/update/main.yml} (52%)
rename guests/{ => playbooks/update}/tasks/base.yml (92%)
rename guests/{ => playbooks/update}/tasks/bootloader.yml (100%)
rename guests/{ => playbooks/update}/tasks/bootstrap.yml (100%)
rename guests/{ => playbooks/update}/tasks/jenkins.yml (92%)
rename guests/{ => playbooks/update}/tasks/kludges.yml (100%)
rename guests/{ => playbooks/update}/tasks/packages.yml (96%)
rename guests/{ => playbooks/update}/tasks/paths.yml (100%)
rename guests/{ => playbooks/update}/tasks/services.yml (100%)
rename guests/{ => playbooks/update}/tasks/users.yml (95%)
rename guests/{ => playbooks/update}/templates/bash_profile.j2 (100%)
rename guests/{ => playbooks/update}/templates/bashrc.j2 (100%)
rename guests/{ => playbooks/update}/templates/ccache.conf.j2 (100%)
rename guests/{ => playbooks/update}/templates/fedora-rawhide-kernel-nodebug.repo.j2 (100%)
rename guests/{ => playbooks/update}/templates/jenkins.service.j2 (100%)
rename guests/{ => playbooks/update}/templates/jessie-backports.preferences.j2 (100%)
rename guests/{ => playbooks/update}/templates/jessie-backports.sources.j2 (100%)
--
2.17.1
6 years, 3 months
- 2
- 17