[libvirt] [dbus PATCH] tests: Remove unused import
by Andrea Bolognani
This fixes 'make syntax-check'.
The issue was introduced by commit 7da2b425a8cc.
Reported-by: Ján Tomko <jtomko(a)redhat.com>
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
tests/test_nodedev.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/test_nodedev.py b/tests/test_nodedev.py
index 082cf0b..5c8206e 100755
--- a/tests/test_nodedev.py
+++ b/tests/test_nodedev.py
@@ -2,7 +2,6 @@
import dbus
import libvirttest
-import pytest
class TestNodeDevice(libvirttest.BaseTestClass):
--
2.17.1
6 years, 3 months
- 2
- 1
[libvirt] [dbus PATCH 0/4] Fix 'make check' with libvirt 3.0.0
by Andrea Bolognani
Andrea Bolognani (4):
tests: Drop pytest.mark.usefixtures from test_nodedev
tests: Move some test cases to test_nodedev
tests: Don't open-code node_device_create()
tests: Make node_device_create() work with libvirt 3.0.0
tests/libvirttest.py | 17 ++++++++++++++++-
tests/test_connect.py | 27 ---------------------------
tests/test_nodedev.py | 26 +++++++++++++++++++++++++-
tests/xmldata.py | 2 +-
4 files changed, 42 insertions(+), 30 deletions(-)
--
2.17.1
6 years, 3 months
- 3
- 8
[libvirt] [jenkins-ci PATCH] guests: Install libiscsi for libvirt
by Andrea Bolognani
Since libvirt commit 34a6962c41b4 it's required to
successfully build the RPM packages.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/vars/mappings.yml | 4 ++++
guests/vars/projects/libvirt.yml | 1 +
2 files changed, 5 insertions(+)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index b2d63c9..21948fb 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -239,6 +239,10 @@ mappings:
Debian: libgovirt-dev
Debian8:
+ libiscsi:
+ deb: libiscsi-dev
+ rpm: libiscsi-devel
+
libnl3:
deb: libnl-3-dev
rpm: libnl3-devel
diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml
index 3274564..605d201 100644
--- a/guests/vars/projects/libvirt.yml
+++ b/guests/vars/projects/libvirt.yml
@@ -22,6 +22,7 @@ packages:
- libcap-ng
- libcurl
- libdbus
+ - libiscsi
- libnl3
- libnlroute3
- libnuma
--
2.17.1
6 years, 3 months
- 2
- 1
[libvirt] [PATCH v2] libvirt_iohelper: record the libvirt_iohelper's error message at virFileWrapperFdFree
by xinhua.Cao
Currently iohelper's error log is recorded in virFileWrapperFdClose.
In qemuDomainSaveMemory, it usually fails at qemuMigrationSrcToFile,
and then goto cleanup, so the iohelper error log is not recorded,
and so is the another placement. We now record the error log of
iohelper by move it to the virFileWrapperFdFree record.
And for the virCommandWait() - we should call virCommandAbort() in
virFileWrapperFdFree() to make sure no process is left behind. If
virCommandWait() is called then virCommandAbort() is a NO-OP. If it
isn't, then Abort() will kill iohelper. Thanks for Michal for this
advice
Signed-off-by: xinhua.Cao <caoxinhua(a)huawei.com>
---
src/util/virfile.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 1faeebb..590fc0e 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -330,9 +330,6 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd)
return 0;
ret = virCommandWait(wfd->cmd, NULL);
- if (wfd->err_msg && *wfd->err_msg)
- VIR_WARN("iohelper reports: %s", wfd->err_msg);
-
return ret;
}
@@ -351,6 +348,10 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd)
if (!wfd)
return;
+ if (wfd->err_msg && *wfd->err_msg)
+ VIR_WARN("iohelper reports: %s", wfd->err_msg);
+
+ virCommandAbort(wfd->cmd);
VIR_FREE(wfd->err_msg);
virCommandFree(wfd->cmd);
--
2.8.3
6 years, 3 months
- 2
- 1
[libvirt] [PATCH 0/7] Remove arbitrary limit on socket_id/core_id
by Andrea Bolognani
See patch 6 for the explanation; the previous 5 patches
are cleanups.
I had to snip out some patches to comply with the message
size limit for the list - ironic, I know. The full commits
can be fetched from
https://github.com/andreabolognani/libvirt/tree/high-ids
Andrea Bolognani (7):
util: Drop VIR_HOST_CPU_MASK_LEN
tests: Drop unused data
tests: Add missing thread_siblings_list files
util: Rewrite virHostCPUCountThreadSiblings()
tests: Drop core_siblings/thread_siblings files
utils: Remove arbitrary limit on socket_id/core_id
tests: Add linux-high-ids test
src/util/virhostcpu.c | 69 +++------
.../system/cpu/cpu0/topology/core_siblings | 1 -
.../system/cpu/cpu1/topology/core_siblings | 1 -
.../system/cpu/cpu1/topology/thread_siblings | 1 -
.../system/cpu/cpu10/topology/core_siblings | 1 -
.../system/cpu/cpu10/topology/thread_siblings | 1 -
.../system/cpu/cpu11/topology/core_siblings | 1 -
.../system/cpu/cpu11/topology/thread_siblings | 1 -
.../system/cpu/cpu12/topology/core_siblings | 1 -
.../system/cpu/cpu12/topology/thread_siblings | 1 -
.../system/cpu/cpu13/topology/core_siblings | 1 -
.../system/cpu/cpu13/topology/thread_siblings | 1 -
.../system/cpu/cpu14/topology/core_siblings | 1 -
.../system/cpu/cpu14/topology/thread_siblings | 1 -
.../system/cpu/cpu15/topology/core_siblings | 1 -
.../system/cpu/cpu15/topology/thread_siblings | 1 -
.../system/cpu/cpu2/topology/core_siblings | 1 -
.../system/cpu/cpu2/topology/thread_siblings | 1 -
.../system/cpu/cpu3/topology/core_siblings | 1 -
.../system/cpu/cpu3/topology/thread_siblings | 1 -
.../system/cpu/cpu4/topology/core_siblings | 1 -
.../system/cpu/cpu4/topology/thread_siblings | 1 -
.../system/cpu/cpu5/topology/core_siblings | 1 -
.../system/cpu/cpu5/topology/thread_siblings | 1 -
.../system/cpu/cpu6/topology/core_siblings | 1 -
.../system/cpu/cpu6/topology/thread_siblings | 1 -
.../system/cpu/cpu7/topology/core_siblings | 1 -
.../system/cpu/cpu7/topology/thread_siblings | 1 -
.../system/cpu/cpu8/topology/core_siblings | 1 -
.../system/cpu/cpu8/topology/thread_siblings | 1 -
.../system/cpu/cpu9/topology/core_siblings | 1 -
.../system/cpu/cpu9/topology/thread_siblings | 1 -
.../system/cpu/cpu0/topology/core_siblings | 1 -
.../system/cpu/cpu0/topology/thread_siblings | 1 -
.../system/cpu/cpu1/topology/core_siblings | 1 -
.../system/cpu/cpu1/topology/thread_siblings | 1 -
.../system/cpu/cpu2/topology/core_siblings | 1 -
.../system/cpu/cpu2/topology/thread_siblings | 1 -
.../system/cpu/cpu3/topology/core_siblings | 1 -
.../system/cpu/cpu3/topology/thread_siblings | 1 -
.../system/cpu/cpu4/topology/core_siblings | 1 -
.../system/cpu/cpu4/topology/thread_siblings | 1 -
.../system/cpu/cpu5/topology/core_siblings | 1 -
.../system/cpu/cpu5/topology/thread_siblings | 1 -
.../system/cpu/cpu6/topology/core_siblings | 1 -
.../system/cpu/cpu6/topology/thread_siblings | 1 -
.../system/cpu/cpu7/topology/core_siblings | 1 -
.../system/cpu/cpu7/topology/thread_siblings | 1 -
.../system/cpu/cpu0/topology/core_siblings | 1 -
.../system/cpu/cpu0/topology/thread_siblings | 1 -
.../system/cpu/cpu0/topology/core_siblings | 1 -
.../system/cpu/cpu0/topology/thread_siblings | 1 -
.../system/cpu/cpu0/topology/core_siblings | 1 -
.../system/cpu/cpu0/topology/thread_siblings | 1 -
.../system/cpu/cpu1/topology/core_siblings | 1 -
.../system/cpu/cpu1/topology/thread_siblings | 1 -
.../system/cpu/cpu10/topology/core_siblings | 1 -
.../system/cpu/cpu10/topology/thread_siblings | 1 -
.../system/cpu/cpu11/topology/core_siblings | 1 -
.../system/cpu/cpu11/topology/thread_siblings | 1 -
.../system/cpu/cpu2/topology/core_siblings | 1 -
.../system/cpu/cpu2/topology/thread_siblings | 1 -
.../system/cpu/cpu3/topology/core_siblings | 1 -
.../system/cpu/cpu3/topology/thread_siblings | 1 -
.../system/cpu/cpu4/topology/core_siblings | 1 -
.../system/cpu/cpu4/topology/thread_siblings | 1 -
.../system/cpu/cpu5/topology/core_siblings | 1 -
.../system/cpu/cpu5/topology/thread_siblings | 1 -
.../system/cpu/cpu6/topology/core_siblings | 1 -
.../system/cpu/cpu6/topology/thread_siblings | 1 -
.../system/cpu/cpu7/topology/core_siblings | 1 -
.../system/cpu/cpu7/topology/thread_siblings | 1 -
.../system/cpu/cpu8/topology/core_siblings | 1 -
.../system/cpu/cpu8/topology/thread_siblings | 1 -
.../system/cpu/cpu9/topology/core_siblings | 1 -
.../system/cpu/cpu9/topology/thread_siblings | 1 -
.../linux-aarch64-high-ids.cpuinfo | 143 ++++++++++++++++++
.../linux-aarch64-high-ids.expected | 1 +
.../virhostcpudata/linux-caches1/cpu/offline | 1 -
.../cpu/cpu104/topology/core_siblings | 1 -
.../cpu/cpu104/topology/thread_siblings | 1 -
.../cpu/cpu112/topology/core_siblings | 1 -
.../cpu/cpu112/topology/thread_siblings | 1 -
.../cpu/cpu120/topology/core_siblings | 1 -
.../cpu/cpu120/topology/thread_siblings | 1 -
.../cpu/cpu128/topology/core_siblings | 1 -
.../cpu/cpu128/topology/thread_siblings | 1 -
.../cpu/cpu136/topology/core_siblings | 1 -
.../cpu/cpu136/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/core_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu24/topology/core_siblings | 1 -
.../cpu/cpu24/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/core_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu48/topology/core_siblings | 1 -
.../cpu/cpu48/topology/thread_siblings | 1 -
.../cpu/cpu72/topology/core_siblings | 1 -
.../cpu/cpu72/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/core_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/core_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/core_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/core_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/core_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/core_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../linux-high-ids/cpu/cpu0/online} | 0
.../linux-high-ids/cpu/cpu0/topology/core_id | 1 +
.../cpu/cpu0/topology/core_siblings_list | 1 +
.../cpu/cpu0/topology/physical_package_id | 1 +
.../cpu/cpu0/topology/thread_siblings_list | 1 +
.../cpu/cpu1/online} | 0
.../linux-high-ids/cpu/cpu1/topology/core_id | 1 +
.../cpu/cpu1/topology/core_siblings_list | 1 +
.../cpu/cpu1/topology/physical_package_id | 1 +
.../cpu/cpu1/topology/thread_siblings_list | 1 +
.../cpu/cpu10/online} | 0
.../linux-high-ids/cpu/cpu10/topology/core_id | 1 +
.../cpu/cpu10/topology/core_siblings_list | 1 +
.../cpu/cpu10/topology/physical_package_id | 1 +
.../cpu/cpu10/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu11/online} | 0
.../linux-high-ids/cpu/cpu11/topology/core_id | 1 +
.../cpu/cpu11/topology/core_siblings_list | 1 +
.../cpu/cpu11/topology/physical_package_id | 1 +
.../cpu/cpu11/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu12/online} | 0
.../linux-high-ids/cpu/cpu12/topology/core_id | 1 +
.../cpu/cpu12/topology/core_siblings_list | 1 +
.../cpu/cpu12/topology/physical_package_id | 1 +
.../cpu/cpu12/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu13/online} | 0
.../linux-high-ids/cpu/cpu13/topology/core_id | 1 +
.../cpu/cpu13/topology/core_siblings_list | 1 +
.../cpu/cpu13/topology/physical_package_id | 1 +
.../cpu/cpu13/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu14/online} | 0
.../linux-high-ids/cpu/cpu14/topology/core_id | 1 +
.../cpu/cpu14/topology/core_siblings_list | 1 +
.../cpu/cpu14/topology/physical_package_id | 1 +
.../cpu/cpu14/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu15/online} | 0
.../linux-high-ids/cpu/cpu15/topology/core_id | 1 +
.../cpu/cpu15/topology/core_siblings_list | 1 +
.../cpu/cpu15/topology/physical_package_id | 1 +
.../cpu/cpu15/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu2/online} | 0
.../linux-high-ids/cpu/cpu2/topology/core_id | 1 +
.../cpu/cpu2/topology/core_siblings_list | 1 +
.../cpu/cpu2/topology/physical_package_id | 1 +
.../cpu/cpu2/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu3/online} | 0
.../linux-high-ids/cpu/cpu3/topology/core_id | 1 +
.../cpu/cpu3/topology/core_siblings_list | 1 +
.../cpu/cpu3/topology/physical_package_id | 1 +
.../cpu/cpu3/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu4/online} | 0
.../linux-high-ids/cpu/cpu4/topology/core_id | 1 +
.../cpu/cpu4/topology/core_siblings_list | 1 +
.../cpu/cpu4/topology/physical_package_id | 1 +
.../cpu/cpu4/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu5/online} | 0
.../linux-high-ids/cpu/cpu5/topology/core_id | 1 +
.../cpu/cpu5/topology/core_siblings_list | 1 +
.../cpu/cpu5/topology/physical_package_id | 1 +
.../cpu/cpu5/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu6/online} | 0
.../linux-high-ids/cpu/cpu6/topology/core_id | 1 +
.../cpu/cpu6/topology/core_siblings_list | 1 +
.../cpu/cpu6/topology/physical_package_id | 1 +
.../cpu/cpu6/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu7/online} | 0
.../linux-high-ids/cpu/cpu7/topology/core_id | 1 +
.../cpu/cpu7/topology/core_siblings_list | 1 +
.../cpu/cpu7/topology/physical_package_id | 1 +
.../cpu/cpu7/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu8/online} | 0
.../linux-high-ids/cpu/cpu8/topology/core_id | 1 +
.../cpu/cpu8/topology/core_siblings_list | 1 +
.../cpu/cpu8/topology/physical_package_id | 1 +
.../cpu/cpu8/topology/thread_siblings_list | 1 +
.../linux-high-ids/cpu/cpu9/online} | 0
.../linux-high-ids/cpu/cpu9/topology/core_id | 1 +
.../cpu/cpu9/topology/core_siblings_list | 1 +
.../cpu/cpu9/topology/physical_package_id | 1 +
.../cpu/cpu9/topology/thread_siblings_list | 1 +
.../virhostcpudata/linux-high-ids/cpu/online | 1 +
.../virhostcpudata/linux-high-ids/cpu/present | 1 +
.../linux-high-ids/node/node0/cpu0 | 1 +
.../linux-high-ids/node/node0/cpu1 | 1 +
.../linux-high-ids/node/node0/cpu2 | 1 +
.../linux-high-ids/node/node0/cpu3 | 1 +
.../linux-high-ids/node/node0/cpu4 | 1 +
.../linux-high-ids/node/node0/cpu5 | 1 +
.../linux-high-ids/node/node0/cpu6 | 1 +
.../linux-high-ids/node/node0/cpu7 | 1 +
.../node/node0/cpulist} | 0
.../linux-high-ids/node/node1/cpu10 | 1 +
.../linux-high-ids/node/node1/cpu11 | 1 +
.../linux-high-ids/node/node1/cpu12 | 1 +
.../linux-high-ids/node/node1/cpu13 | 1 +
.../linux-high-ids/node/node1/cpu14 | 1 +
.../linux-high-ids/node/node1/cpu15 | 1 +
.../linux-high-ids/node/node1/cpu8 | 1 +
.../linux-high-ids/node/node1/cpu9 | 1 +
.../linux-high-ids/node/node1/cpulist | 1 +
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/core_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/core_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/core_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/core_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/core_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/core_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/core_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/core_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/core_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/core_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/core_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/core_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu104/topology/core_siblings | 1 -
.../cpu/cpu104/topology/thread_siblings | 1 -
.../cpu/cpu112/topology/core_siblings | 1 -
.../cpu/cpu112/topology/thread_siblings | 1 -
.../cpu/cpu120/topology/core_siblings | 1 -
.../cpu/cpu120/topology/thread_siblings | 1 -
.../cpu/cpu128/topology/core_siblings | 1 -
.../cpu/cpu128/topology/thread_siblings | 1 -
.../cpu/cpu136/topology/core_siblings | 1 -
.../cpu/cpu136/topology/thread_siblings | 1 -
.../cpu/cpu144/topology/core_siblings | 1 -
.../cpu/cpu144/topology/thread_siblings | 1 -
.../cpu/cpu152/topology/core_siblings | 1 -
.../cpu/cpu152/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/core_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu24/topology/core_siblings | 1 -
.../cpu/cpu24/topology/thread_siblings | 1 -
.../cpu/cpu32/topology/core_siblings | 1 -
.../cpu/cpu32/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/core_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu48/topology/core_siblings | 1 -
.../cpu/cpu48/topology/thread_siblings | 1 -
.../cpu/cpu56/topology/core_siblings | 1 -
.../cpu/cpu56/topology/thread_siblings | 1 -
.../cpu/cpu64/topology/core_siblings | 1 -
.../cpu/cpu64/topology/thread_siblings | 1 -
.../cpu/cpu72/topology/core_siblings | 1 -
.../cpu/cpu72/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/core_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu80/topology/core_siblings | 1 -
.../cpu/cpu80/topology/thread_siblings | 1 -
.../cpu/cpu88/topology/core_siblings | 1 -
.../cpu/cpu88/topology/thread_siblings | 1 -
.../cpu/cpu96/topology/core_siblings | 1 -
.../cpu/cpu96/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu104/topology/core_siblings | 1 -
.../cpu/cpu104/topology/thread_siblings | 1 -
.../cpu/cpu112/topology/core_siblings | 1 -
.../cpu/cpu112/topology/thread_siblings | 1 -
.../cpu/cpu128/topology/core_siblings | 1 -
.../cpu/cpu128/topology/thread_siblings | 1 -
.../cpu/cpu136/topology/core_siblings | 1 -
.../cpu/cpu136/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/core_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu24/topology/core_siblings | 1 -
.../cpu/cpu24/topology/thread_siblings | 1 -
.../cpu/cpu32/topology/core_siblings | 1 -
.../cpu/cpu32/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/core_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu48/topology/core_siblings | 1 -
.../cpu/cpu48/topology/thread_siblings | 1 -
.../cpu/cpu56/topology/core_siblings | 1 -
.../cpu/cpu56/topology/thread_siblings | 1 -
.../cpu/cpu72/topology/core_siblings | 1 -
.../cpu/cpu72/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/core_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu80/topology/core_siblings | 1 -
.../cpu/cpu80/topology/thread_siblings | 1 -
.../cpu/cpu88/topology/core_siblings | 1 -
.../cpu/cpu88/topology/thread_siblings | 1 -
.../cpu/cpu96/topology/core_siblings | 1 -
.../cpu/cpu96/topology/thread_siblings | 1 -
.../cpu/cpu104/topology/core_siblings | 1 -
.../cpu/cpu104/topology/thread_siblings | 1 -
.../cpu/cpu112/topology/core_siblings | 1 -
.../cpu/cpu112/topology/thread_siblings | 1 -
.../cpu/cpu128/topology/core_siblings | 1 -
.../cpu/cpu128/topology/thread_siblings | 1 -
.../cpu/cpu136/topology/core_siblings | 1 -
.../cpu/cpu136/topology/thread_siblings | 1 -
.../cpu/cpu152/topology/core_siblings | 1 -
.../cpu/cpu152/topology/thread_siblings | 1 -
.../cpu/cpu153/topology/core_siblings | 1 -
.../cpu/cpu153/topology/thread_siblings | 1 -
.../cpu/cpu154/topology/core_siblings | 1 -
.../cpu/cpu154/topology/thread_siblings | 1 -
.../cpu/cpu155/topology/core_siblings | 1 -
.../cpu/cpu155/topology/thread_siblings | 1 -
.../cpu/cpu156/topology/core_siblings | 1 -
.../cpu/cpu156/topology/thread_siblings | 1 -
.../cpu/cpu157/topology/core_siblings | 1 -
.../cpu/cpu157/topology/thread_siblings | 1 -
.../cpu/cpu158/topology/core_siblings | 1 -
.../cpu/cpu158/topology/thread_siblings | 1 -
.../cpu/cpu159/topology/core_siblings | 1 -
.../cpu/cpu159/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/core_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu48/topology/core_siblings | 1 -
.../cpu/cpu48/topology/thread_siblings | 1 -
.../cpu/cpu56/topology/core_siblings | 1 -
.../cpu/cpu56/topology/thread_siblings | 1 -
.../cpu/cpu68/topology/core_siblings | 1 -
.../cpu/cpu68/topology/thread_siblings | 1 -
.../cpu/cpu72/topology/core_siblings | 1 -
.../cpu/cpu72/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/core_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu80/topology/core_siblings | 1 -
.../cpu/cpu80/topology/thread_siblings | 1 -
.../cpu/cpu88/topology/core_siblings | 1 -
.../cpu/cpu88/topology/thread_siblings | 1 -
.../cpu/cpu96/topology/core_siblings | 1 -
.../cpu/cpu96/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../linux-test1/cpu/cpu1/core_siblings | 1 -
.../linux-test1/cpu/cpu1/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu10/topology/thread_siblings | 1 -
.../cpu/cpu11/topology/thread_siblings | 1 -
.../cpu/cpu12/topology/thread_siblings | 1 -
.../cpu/cpu13/topology/thread_siblings | 1 -
.../cpu/cpu14/topology/thread_siblings | 1 -
.../cpu/cpu15/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu17/topology/thread_siblings | 1 -
.../cpu/cpu18/topology/thread_siblings | 1 -
.../cpu/cpu19/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu20/topology/thread_siblings | 1 -
.../cpu/cpu21/topology/thread_siblings | 1 -
.../cpu/cpu22/topology/thread_siblings | 1 -
.../cpu/cpu23/topology/thread_siblings | 1 -
.../cpu/cpu24/topology/thread_siblings | 1 -
.../cpu/cpu25/topology/thread_siblings | 1 -
.../cpu/cpu26/topology/thread_siblings | 1 -
.../cpu/cpu27/topology/thread_siblings | 1 -
.../cpu/cpu28/topology/thread_siblings | 1 -
.../cpu/cpu29/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu30/topology/thread_siblings | 1 -
.../cpu/cpu31/topology/thread_siblings | 1 -
.../cpu/cpu32/topology/thread_siblings | 1 -
.../cpu/cpu33/topology/thread_siblings | 1 -
.../cpu/cpu34/topology/thread_siblings | 1 -
.../cpu/cpu35/topology/thread_siblings | 1 -
.../cpu/cpu36/topology/thread_siblings | 1 -
.../cpu/cpu37/topology/thread_siblings | 1 -
.../cpu/cpu38/topology/thread_siblings | 1 -
.../cpu/cpu39/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu41/topology/thread_siblings | 1 -
.../cpu/cpu42/topology/thread_siblings | 1 -
.../cpu/cpu43/topology/thread_siblings | 1 -
.../cpu/cpu44/topology/thread_siblings | 1 -
.../cpu/cpu45/topology/thread_siblings | 1 -
.../cpu/cpu46/topology/thread_siblings | 1 -
.../cpu/cpu47/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu9/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu10/topology/thread_siblings | 1 -
.../cpu/cpu11/topology/thread_siblings | 1 -
.../cpu/cpu12/topology/thread_siblings | 1 -
.../cpu/cpu13/topology/thread_siblings | 1 -
.../cpu/cpu14/topology/thread_siblings | 1 -
.../cpu/cpu15/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu9/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/core_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/core_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings_list | 1 +
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings_list} | 0
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings_list | 1 +
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings_list | 1 +
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings_list | 1 +
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings_list | 1 +
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu10/topology/thread_siblings | 1 -
.../cpu/cpu11/topology/thread_siblings | 1 -
.../cpu/cpu12/topology/thread_siblings | 1 -
.../cpu/cpu13/topology/thread_siblings | 1 -
.../cpu/cpu14/topology/thread_siblings | 1 -
.../cpu/cpu15/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu17/topology/thread_siblings | 1 -
.../cpu/cpu18/topology/thread_siblings | 1 -
.../cpu/cpu19/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu20/topology/thread_siblings | 1 -
.../cpu/cpu21/topology/thread_siblings | 1 -
.../cpu/cpu22/topology/thread_siblings | 1 -
.../cpu/cpu23/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu9/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings_list | 1 +
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings_list | 1 +
.../cpu/cpu10/topology/thread_siblings | 1 -
.../cpu/cpu10/topology/thread_siblings_list | 1 +
.../cpu/cpu11/topology/thread_siblings | 1 -
.../cpu/cpu11/topology/thread_siblings_list | 1 +
.../cpu/cpu12/topology/thread_siblings | 1 -
.../cpu/cpu12/topology/thread_siblings_list | 1 +
.../cpu/cpu13/topology/thread_siblings | 1 -
.../cpu/cpu13/topology/thread_siblings_list | 1 +
.../cpu/cpu14/topology/thread_siblings | 1 -
.../cpu/cpu14/topology/thread_siblings_list | 1 +
.../cpu/cpu15/topology/thread_siblings | 1 -
.../cpu/cpu15/topology/thread_siblings_list | 1 +
.../cpu/cpu16/topology/thread_siblings | 1 -
.../cpu/cpu16/topology/thread_siblings_list | 1 +
.../cpu/cpu17/topology/thread_siblings | 1 -
.../cpu/cpu17/topology/thread_siblings_list | 1 +
.../cpu/cpu18/topology/thread_siblings | 1 -
.../cpu/cpu18/topology/thread_siblings_list | 1 +
.../cpu/cpu19/topology/thread_siblings | 1 -
.../cpu/cpu19/topology/thread_siblings_list | 1 +
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings_list | 1 +
.../cpu/cpu20/topology/thread_siblings | 1 -
.../cpu/cpu20/topology/thread_siblings_list | 1 +
.../cpu/cpu21/topology/thread_siblings | 1 -
.../cpu/cpu21/topology/thread_siblings_list | 1 +
.../cpu/cpu22/topology/thread_siblings | 1 -
.../cpu/cpu22/topology/thread_siblings_list | 1 +
.../cpu/cpu23/topology/thread_siblings | 1 -
.../cpu/cpu23/topology/thread_siblings_list | 1 +
.../cpu/cpu24/topology/thread_siblings | 1 -
.../cpu/cpu24/topology/thread_siblings_list | 1 +
.../cpu/cpu25/topology/thread_siblings | 1 -
.../cpu/cpu25/topology/thread_siblings_list | 1 +
.../cpu/cpu26/topology/thread_siblings | 1 -
.../cpu/cpu26/topology/thread_siblings_list | 1 +
.../cpu/cpu27/topology/thread_siblings | 1 -
.../cpu/cpu27/topology/thread_siblings_list | 1 +
.../cpu/cpu28/topology/thread_siblings | 1 -
.../cpu/cpu28/topology/thread_siblings_list | 1 +
.../cpu/cpu29/topology/thread_siblings | 1 -
.../cpu/cpu29/topology/thread_siblings_list | 1 +
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings_list | 1 +
.../cpu/cpu30/topology/thread_siblings | 1 -
.../cpu/cpu30/topology/thread_siblings_list | 1 +
.../cpu/cpu31/topology/thread_siblings | 1 -
.../cpu/cpu31/topology/thread_siblings_list | 1 +
.../cpu/cpu32/topology/thread_siblings | 1 -
.../cpu/cpu32/topology/thread_siblings_list | 1 +
.../cpu/cpu33/topology/thread_siblings | 1 -
.../cpu/cpu33/topology/thread_siblings_list | 1 +
.../cpu/cpu34/topology/thread_siblings | 1 -
.../cpu/cpu34/topology/thread_siblings_list | 1 +
.../cpu/cpu35/topology/thread_siblings | 1 -
.../cpu/cpu35/topology/thread_siblings_list | 1 +
.../cpu/cpu36/topology/thread_siblings | 1 -
.../cpu/cpu36/topology/thread_siblings_list | 1 +
.../cpu/cpu37/topology/thread_siblings | 1 -
.../cpu/cpu37/topology/thread_siblings_list | 1 +
.../cpu/cpu38/topology/thread_siblings | 1 -
.../cpu/cpu38/topology/thread_siblings_list | 1 +
.../cpu/cpu39/topology/thread_siblings | 1 -
.../cpu/cpu39/topology/thread_siblings_list | 1 +
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings_list | 1 +
.../cpu/cpu40/topology/thread_siblings | 1 -
.../cpu/cpu40/topology/thread_siblings_list | 1 +
.../cpu/cpu41/topology/thread_siblings | 1 -
.../cpu/cpu41/topology/thread_siblings_list | 1 +
.../cpu/cpu42/topology/thread_siblings | 1 -
.../cpu/cpu42/topology/thread_siblings_list | 1 +
.../cpu/cpu43/topology/thread_siblings | 1 -
.../cpu/cpu43/topology/thread_siblings_list | 1 +
.../cpu/cpu44/topology/thread_siblings | 1 -
.../cpu/cpu44/topology/thread_siblings_list | 1 +
.../cpu/cpu45/topology/thread_siblings | 1 -
.../cpu/cpu45/topology/thread_siblings_list | 1 +
.../cpu/cpu46/topology/thread_siblings | 1 -
.../cpu/cpu46/topology/thread_siblings_list | 1 +
.../cpu/cpu47/topology/thread_siblings | 1 -
.../cpu/cpu47/topology/thread_siblings_list | 1 +
.../cpu/cpu48/topology/thread_siblings | 1 -
.../cpu/cpu48/topology/thread_siblings_list | 1 +
.../cpu/cpu49/topology/thread_siblings | 1 -
.../cpu/cpu49/topology/thread_siblings_list | 1 +
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings_list | 1 +
.../cpu/cpu50/topology/thread_siblings | 1 -
.../cpu/cpu50/topology/thread_siblings_list | 1 +
.../cpu/cpu51/topology/thread_siblings | 1 -
.../cpu/cpu51/topology/thread_siblings_list | 1 +
.../cpu/cpu52/topology/thread_siblings | 1 -
.../cpu/cpu52/topology/thread_siblings_list | 1 +
.../cpu/cpu53/topology/thread_siblings | 1 -
.../cpu/cpu53/topology/thread_siblings_list | 1 +
.../cpu/cpu54/topology/thread_siblings | 1 -
.../cpu/cpu54/topology/thread_siblings_list | 1 +
.../cpu/cpu55/topology/thread_siblings | 1 -
.../cpu/cpu55/topology/thread_siblings_list | 1 +
.../cpu/cpu56/topology/thread_siblings | 1 -
.../cpu/cpu56/topology/thread_siblings_list | 1 +
.../cpu/cpu57/topology/thread_siblings | 1 -
.../cpu/cpu57/topology/thread_siblings_list | 1 +
.../cpu/cpu58/topology/thread_siblings | 1 -
.../cpu/cpu58/topology/thread_siblings_list | 1 +
.../cpu/cpu59/topology/thread_siblings | 1 -
.../cpu/cpu59/topology/thread_siblings_list | 1 +
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings_list | 1 +
.../cpu/cpu60/topology/thread_siblings | 1 -
.../cpu/cpu60/topology/thread_siblings_list | 1 +
.../cpu/cpu61/topology/thread_siblings | 1 -
.../cpu/cpu61/topology/thread_siblings_list | 1 +
.../cpu/cpu62/topology/thread_siblings | 1 -
.../cpu/cpu62/topology/thread_siblings_list | 1 +
.../cpu/cpu63/topology/thread_siblings | 1 -
.../cpu/cpu63/topology/thread_siblings_list | 1 +
.../cpu/cpu7/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings_list | 1 +
.../cpu/cpu8/topology/thread_siblings | 1 -
.../cpu/cpu8/topology/thread_siblings_list | 1 +
.../cpu/cpu9/topology/thread_siblings | 1 -
.../cpu/cpu9/topology/thread_siblings_list | 1 +
.../cpu/cpu0/topology/core_siblings | 1 -
.../cpu/cpu0/topology/thread_siblings | 1 -
.../cpu/cpu1/topology/core_siblings | 1 -
.../cpu/cpu1/topology/thread_siblings | 1 -
.../cpu/cpu2/topology/core_siblings | 1 -
.../cpu/cpu2/topology/thread_siblings | 1 -
.../cpu/cpu3/topology/core_siblings | 1 -
.../cpu/cpu3/topology/thread_siblings | 1 -
.../cpu/cpu4/topology/core_siblings | 1 -
.../cpu/cpu4/topology/thread_siblings | 1 -
.../cpu/cpu5/topology/core_siblings | 1 -
.../cpu/cpu5/topology/thread_siblings | 1 -
.../cpu/cpu6/topology/core_siblings | 1 -
.../cpu/cpu6/topology/thread_siblings | 1 -
.../cpu/cpu7/topology/core_siblings | 1 -
.../cpu/cpu7/topology/thread_siblings | 1 -
tests/virhostcputest.c | 1 +
624 files changed, 317 insertions(+), 499 deletions(-)
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-caches/system/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl-skx/system/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu10/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu11/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/core_siblings
delete mode 100644 tests/vircaps2xmldata/linux-resctrl/system/cpu/cpu9/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.expected
delete mode 100644 tests/virhostcpudata/linux-caches1/cpu/offline
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu104/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu112/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu120/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu128/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu136/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu16/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu24/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu40/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu48/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-deconf-cpus/cpu/cpu72/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-f21-mustang/cpu/cpu7/topology/thread_siblings
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu0/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
rename tests/virhostcpudata/{linux-raspberrypi/cpu/cpu0/topology/core_siblings => linux-high-ids/cpu/cpu1/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
rename tests/virhostcpudata/{linux-raspberrypi/cpu/cpu0/topology/thread_siblings => linux-high-ids/cpu/cpu10/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu11/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu12/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu13/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu14/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu15/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu2/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu3/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu4/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu5/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu6/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu7/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu8/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
copy tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-high-ids/cpu/cpu9/online} (100%)
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/online
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/present
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu0
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu1
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu2
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu3
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu4
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu5
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu6
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node0/cpu7
rename tests/virhostcpudata/{linux-caches1/cpu/possible => linux-high-ids/node/node0/cpulist} (100%)
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu10
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu11
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu12
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu13
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu14
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu15
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu8
create mode 120000 tests/virhostcpudata/linux-high-ids/node/node1/cpu9
create mode 100644 tests/virhostcpudata/linux-high-ids/node/node1/cpulist
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhel74-moonshot/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-rhelsa-3.19.0-mustang/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu104/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu112/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu120/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu128/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu136/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu144/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu152/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu16/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu24/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu32/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu40/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu48/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu56/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu64/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu72/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu80/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu88/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores1/cpu/cpu96/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu104/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu112/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu128/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu136/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu16/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu24/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu32/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu40/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu48/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu56/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu72/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu80/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu88/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores2/cpu/cpu96/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu104/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu112/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu128/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu136/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu152/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu153/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu154/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu155/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu156/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu157/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu158/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu159/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu40/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu48/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu56/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu68/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu72/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu80/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu88/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-subcores3/cpu/cpu96/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test1/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test2/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu10/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu11/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu12/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu13/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu14/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu15/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu16/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu17/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu18/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu19/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu20/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu21/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu22/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu23/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu24/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu25/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu26/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu27/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu28/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu29/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu30/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu31/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu32/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu33/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu34/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu35/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu36/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu37/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu38/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu39/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu40/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu41/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu42/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu43/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu44/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu45/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu46/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu47/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test3/cpu/cpu9/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu10/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu11/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu12/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu13/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu14/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu15/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test4/cpu/cpu9/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-test5/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu0/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings
rename tests/{vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings => virhostcpudata/linux-test6/cpu/cpu1/topology/thread_siblings_list} (100%)
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu2/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu3/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu4/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test6/cpu/cpu6/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu10/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu11/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu12/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu13/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu14/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu15/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu16/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu17/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu18/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu19/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu20/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu21/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu22/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu23/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu7/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu8/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test7/cpu/cpu9/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu0/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu1/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu10/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu11/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu12/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu13/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu14/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu15/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu16/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu17/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu18/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu19/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu2/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu20/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu21/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu22/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu23/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu24/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu25/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu26/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu27/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu28/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu29/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu3/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu30/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu31/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu32/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu33/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu34/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu35/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu36/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu37/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu38/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu39/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu4/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu40/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu41/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu42/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu43/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu44/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu45/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu46/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu47/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu48/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu49/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu5/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu50/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu51/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu52/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu53/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu54/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu55/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu56/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu57/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu58/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu59/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu6/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu60/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu61/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu62/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu63/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu7/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu8/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings
create mode 100644 tests/virhostcpudata/linux-test8/cpu/cpu9/topology/thread_siblings_list
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu0/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu1/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu2/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu3/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu4/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu5/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu6/topology/thread_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/core_siblings
delete mode 100644 tests/virhostcpudata/linux-with-frequency/cpu/cpu7/topology/thread_siblings
--
2.17.1
6 years, 3 months
- 3
- 9
[libvirt] [jenkins-ci PATCH] guests: Remove Fedora 26 specific mapping
by Andrea Bolognani
We dropped Fedora 26 support in commit 9dbfddc3e7d9,
but somehow overlooked this bit at the time.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed as trivial.
guests/vars/mappings.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 454afe5..b2d63c9 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -712,7 +712,6 @@ mappings:
deb: libc-dev-bin
rpm: rpcgen
CentOS7: glibc-common
- Fedora26: glibc-common
Fedora27: glibc-common
FreeBSD:
--
2.17.1
6 years, 3 months
- 1
- 0
[libvirt] [PATCH] spec: Enable the iscsi-direct storage driver conditionally
by Andrea Bolognani
Most distributions we build RPMs on don't ship a
recent enough version of libiscsi, so we can't enable
the driver unconditionally. Add an explicit dependency
on the runtime package while at it.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 63834767dd..883c8a49e7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -71,6 +71,13 @@
%define with_storage_zfs 0
%endif
+# We need a recent enough libiscsi (>= 1.18.0)
+%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
+ %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+%else
+ %define with_storage_iscsi_direct 0
+%endif
+
# A few optional bits off by default, we enable later
%define with_fuse 0%{!?_without_fuse:0}
%define with_sanlock 0%{!?_without_sanlock:0}
@@ -319,8 +326,10 @@ BuildRequires: /usr/bin/qemu-img
BuildRequires: lvm2
# For pool type=iscsi
BuildRequires: iscsi-initiator-utils
+%if %{with_storage_iscsi_direct}
# For pool type=iscsi-direct
BuildRequires: libiscsi-devel
+%endif
# For disk driver
BuildRequires: parted-devel
# For Multipath support
@@ -593,14 +602,17 @@ The storage driver backend adding implementation of the storage APIs for iscsi
volumes using the host iscsi stack.
+%if %{with_storage_iscsi_direct}
%package daemon-driver-storage-iscsi-direct
Summary: Storage driver plugin for iscsi-direct
Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
Requires: libvirt-libs = %{version}-%{release}
+Requires: libiscsi
%description daemon-driver-storage-iscsi-direct
The storage driver backend adding implementation of the storage APIs for iscsi
volumes using libiscsi direct connection.
+%endif
%package daemon-driver-storage-mpath
@@ -679,8 +691,10 @@ Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release}
-Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release}
Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release}
+%if %{with_storage_iscsi_direct}
+Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release}
+%endif
%if %{with_storage_gluster}
Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
%endif
@@ -1134,6 +1148,12 @@ exit 1
%define arg_wireshark --without-wireshark-dissector
%endif
+%if %{with_storage_iscsi_direct}
+ %define arg_storage_iscsi_direct --with-storage-iscsi-direct
+%else
+ %define arg_storage_iscsi_direct --without-storage-iscsi-direct
+%endif
+
%define when %(date +"%%F-%%T")
%define where %(hostname)
%define who %{?packager}%{!?packager:Unknown}
@@ -1185,7 +1205,7 @@ rm -f po/stamp-po
--with-storage-fs \
--with-storage-lvm \
--with-storage-iscsi \
- --with-storage-iscsi-direct \
+ %{?arg_storage_iscsi_direct} \
--with-storage-scsi \
--with-storage-disk \
--with-storage-mpath \
@@ -1651,8 +1671,10 @@ exit 0
%files daemon-driver-storage-iscsi
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
+%if %{with_storage_iscsi_direct}
%files daemon-driver-storage-iscsi-direct
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
+%endif
%files daemon-driver-storage-mpath
%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
--
2.17.1
6 years, 3 months
- 2
- 1
[libvirt] [PATCH] spec: Require libiscsi-devel instead of libiscsi
by Andrea Bolognani
Commit 34a6962c41b4 added a BuildRequires for the
iscsi-direct backend, but we need the headers rather
than the runtime package to be available in order to
link against the library.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 788483cdd4..63834767dd 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -320,7 +320,7 @@ BuildRequires: lvm2
# For pool type=iscsi
BuildRequires: iscsi-initiator-utils
# For pool type=iscsi-direct
-BuildRequires: libiscsi
+BuildRequires: libiscsi-devel
# For disk driver
BuildRequires: parted-devel
# For Multipath support
--
2.17.1
6 years, 3 months
- 3
- 3
[libvirt] [PATCH v3 00/11] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar
This third series of patches also modifies a few files in src/util
to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory
and get rid of some VIR_FREE macro invocations and *Free function
calls.
This is meant as a follow-up of the v1 series [1] of the same batch,
and contains those patches which were not (completely) pushed upstream.
[1] https://www.redhat.com/archives/libvir-list/2018-July/msg01947.html
Sukrit Bhatnagar (11):
util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC
util: netlink: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netlink: use VIR_AUTOPTR for aggregate types
util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar
types
util: netdevbridge: use VIR_AUTOPTR for aggregate types
util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types
util: netdev: use VIR_AUTOPTR for aggregate types
util: netdevip: use VIR_AUTOPTR for aggregate types
util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types
util: qemu: use VIR_AUTOPTR for aggregate types
src/util/viriscsi.c | 22 +-
src/util/virnetdev.c | 592 ++++++++++++++++------------------------
src/util/virnetdevbridge.c | 81 ++----
src/util/virnetdevip.c | 130 ++++-----
src/util/virnetdevopenvswitch.c | 80 ++----
src/util/virnetlink.c | 112 ++++----
src/util/virnetlink.h | 5 +
src/util/virqemu.c | 1 +
8 files changed, 397 insertions(+), 626 deletions(-)
--
1.8.3.1
6 years, 3 months
- 3
- 28
[libvirt] [PATCH] bhyve: fix process reconnect
by Roman Bogorodskiy
To reconnect to the bhyve process after deamon restart, a process
VM's pid points to is checked to have proctitle equal to 'bhyve: $vmname'.
However, there could be a bug in bhyve(8) which prevents it from
setting proctitle, so process arguments will look like:
['/usr/sbin/bhyve', ..., 'vmname', NULL]
Fall back to checking this format if proctitle doesn't match as a
workaround for this bug.
---
src/bhyve/bhyve_process.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c
index 9276d7d364..78d6ff1389 100644
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -416,18 +416,28 @@ virBhyveProcessReconnect(virDomainObjPtr vm,
if (proc_argv && proc_argv[0]) {
if (STREQ(expected_proctitle, proc_argv[0])) {
ret = 0;
- priv->mon = bhyveMonitorOpen(vm, data->driver);
- if (vm->def->ngraphics == 1 &&
- vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
- int vnc_port = vm->def->graphics[0]->data.vnc.port;
- if (virPortAllocatorSetUsed(vnc_port) < 0) {
- VIR_WARN("Failed to mark VNC port '%d' as used by '%s'",
- vnc_port, vm->def->name);
- }
+ } else {
+ if (STREQ(BHYVE, proc_argv[0])) {
+ int i = 0;
+ for (; proc_argv[i+1]; i++);
+ if ((i != 0) && (STREQ(vm->def->name, proc_argv[i])))
+ ret = 0;
}
}
}
+ if (ret == 0) {
+ priv->mon = bhyveMonitorOpen(vm, data->driver);
+ if (vm->def->ngraphics == 1 &&
+ vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
+ int vnc_port = vm->def->graphics[0]->data.vnc.port;
+ if (virPortAllocatorSetUsed(vnc_port) < 0) {
+ VIR_WARN("Failed to mark VNC port '%d' as used by '%s'",
+ vnc_port, vm->def->name);
+ }
+ }
+ }
+
cleanup:
if (ret < 0) {
/* If VM is reported to be in active state, but we cannot find
--
2.18.0
6 years, 3 months
- 3
- 2