From nobody Sun May 19 02:38:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1533459033819824.2545544032863; Sun, 5 Aug 2018 01:50:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A15A1300231C; Sun, 5 Aug 2018 08:50:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2BDE4D58B4; Sun, 5 Aug 2018 08:50:31 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 45E971800B6B; Sun, 5 Aug 2018 08:50:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w72Gf1Zq006001 for ; Thu, 2 Aug 2018 12:41:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3C4B213ED80; Thu, 2 Aug 2018 16:41:00 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4B1A213ED6A; Thu, 2 Aug 2018 16:40:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 2 Aug 2018 18:40:56 +0200 Message-Id: <20180802164056.18218-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: mkletzan@redhat.com Subject: [libvirt] [PATCH] tests: Unify data structure for vircaps2xmltest X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Sun, 05 Aug 2018 08:50:32 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Martin Kletzander --- .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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 .../{ =3D> 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/{ =3D> system}/cpu/online | 0 .../linux-basic/{ =3D> system}/cpu/present | 0 .../linux-basic/{ =3D> system}/node/node0/cpu0 | 0 .../linux-basic/{ =3D> system}/node/node0/cpu1 | 0 .../linux-basic/{ =3D> system}/node/node0/cpu2 | 0 .../linux-basic/{ =3D> system}/node/node0/cpu3 | 0 .../{ =3D> system}/node/node0/cpulist | 0 .../linux-basic/{ =3D> system}/node/node1/cpu4 | 0 .../linux-basic/{ =3D> system}/node/node1/cpu5 | 0 .../linux-basic/{ =3D> system}/node/node1/cpu6 | 0 .../linux-basic/{ =3D> system}/node/node1/cpu7 | 0 .../{ =3D> system}/node/node1/cpulist | 0 .../linux-basic/{ =3D> system}/node/node2/cpu10 | 0 .../linux-basic/{ =3D> system}/node/node2/cpu11 | 0 .../linux-basic/{ =3D> system}/node/node2/cpu8 | 0 .../linux-basic/{ =3D> system}/node/node2/cpu9 | 0 .../{ =3D> system}/node/node2/cpulist | 0 .../linux-basic/{ =3D> system}/node/node3/cpu12 | 0 .../linux-basic/{ =3D> system}/node/node3/cpu13 | 0 .../linux-basic/{ =3D> system}/node/node3/cpu14 | 0 .../linux-basic/{ =3D> system}/node/node3/cpu15 | 0 .../{ =3D> system}/node/node3/cpulist | 0 .../linux-basic/{ =3D> system}/node/online | 0 .../linux-basic/{ =3D> system}/node/possible | 0 tests/vircaps2xmltest.c | 37 +++++++------------ 121 files changed, 14 insertions(+), 23 deletions(-) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu0/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu1/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu10/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu11/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu12/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu13/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu14/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu15/topology= /thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu2/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu3/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu4/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu5/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu6/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu7/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu8/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= core_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= core_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= core_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= physical_package_id (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= thread_siblings (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/cpu9/topology/= thread_siblings_list (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/online (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/cpu/present (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node0/cpu0 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node0/cpu1 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node0/cpu2 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node0/cpu3 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node0/cpulist= (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node1/cpu4 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node1/cpu5 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node1/cpu6 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node1/cpu7 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node1/cpulist= (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node2/cpu10 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node2/cpu11 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node2/cpu8 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node2/cpu9 (1= 00%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node2/cpulist= (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node3/cpu12 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node3/cpu13 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node3/cpu14 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node3/cpu15 (= 100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/node3/cpulist= (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> system}/node/online (100%) rename tests/vircaps2xmldata/linux-basic/{ =3D> 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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_sibl= ings_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/threa= d_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/threa= d_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/threa= d_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/threa= d_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/threa= d_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_sibl= ings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_sib= lings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_sibli= ngs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_= siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_sibl= ings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/cor= e_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_sibli= ngs_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/ph= ysical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_p= ackage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physi= cal_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_si= blings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread= _siblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_sib= lings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/threa= d_siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_si= blings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/t= hread_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_sib= lings_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/threa= d_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_sibl= ings_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_sibli= ngs b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_sibli= ngs similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblin= gs rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_s= iblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_sibli= ngs_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_siblin= gs_list rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_s= iblings_list diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_p= ackage_id b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/phys= ical_package_id similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_pa= ckage_id rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physic= al_package_id diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_sib= lings b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_s= iblings similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_sibl= ings rename to tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread= _siblings diff --git a/tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_sib= lings_list b/tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thr= ead_siblings_list similarity index 100% rename from tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_sibl= ings_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/vircaps2x= mldata/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/vircaps2= xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/v= ircaps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/v= ircaps2xmldata/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/vir= caps2xmldata/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/vir= caps2xmldata/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/virc= aps2xmldata/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/virc= aps2xmldata/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/v= ircaps2xmldata/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/vir= caps2xmldata/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/vir= caps2xmldata/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/vir= caps2xmldata/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/vir= caps2xmldata/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/v= ircaps2xmldata/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/vircaps2= xmldata/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/vircap= s2xmldata/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 */ }; =20 static int @@ -46,24 +45,19 @@ test_virCapabilities(const void *opaque) virCapsPtr caps =3D NULL; char *capsXML =3D NULL; char *path =3D NULL; - char *dir =3D NULL; + char *system =3D NULL; char *resctrl =3D NULL; int ret =3D -1; =20 - /* - * We want to keep our directory structure clean, so if there's both r= esctrl - * 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; =20 if (virAsprintf(&resctrl, "%s/vircaps2xmldata/linux-%s/resctrl", abs_srcdir, data->filename) < 0) goto cleanup; =20 - virFileWrapperAddPrefix("/sys/devices/system", dir); + virFileWrapperAddPrefix("/sys/devices/system", system); virFileWrapperAddPrefix("/sys/fs/resctrl", resctrl); caps =3D virCapabilitiesNew(data->arch, data->offlineMigrate, data->li= veMigrate); =20 @@ -89,7 +83,7 @@ test_virCapabilities(const void *opaque) ret =3D 0; =20 cleanup: - VIR_FREE(dir); + VIR_FREE(system); VIR_FREE(resctrl); VIR_FREE(path); VIR_FREE(capsXML); @@ -102,27 +96,24 @@ mymain(void) { int ret =3D 0; =20 -#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate, resctrl)= \ +#define DO_TEST_FULL(filename, arch, offlineMigrate, liveMigrate) \ do { \ struct virCapabilitiesData data =3D {filename, arch, \ offlineMigrate, \ - liveMigrate, resctrl}; \ + liveMigrate}; \ if (virTestRun(filename, test_virCapabilities, &data) < 0) \ ret =3D -1; \ } while (0) =20 - 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); =20 - /* We say there is 'resctrl' even though there is none. This is speci= al - * 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); =20 - 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, tru= e); + 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); =20 return ret; } --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list