From d33bc0f72c87fbc0ac0cf4b56c2a62b552f6c6b0 Mon Sep 17 00:00:00 2001
Message-Id: <d33bc0f72c87fbc0ac0cf4b56c2a62b552f6c6b0@dist-git>
From: Andrea Bolognani <abologna@redhat.com>
Date: Wed, 15 Aug 2018 14:04:44 +0200
Subject: [PATCH] tests: Add linux-high-ids test
This proves libvirt can now handle high socket_id and
core_id values correctly and ensures we won't introduce
regressions in this area.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
(cherry picked from commit 1df3fb7ccbba938aed4ce43ff3ea10f8eec1490c)
https://bugzilla.redhat.com/show_bug.cgi?id=1608479
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
.../linux-aarch64-high-ids.cpuinfo | 143 ++++++++++++++++++
.../linux-aarch64-high-ids.expected | 1 +
.../linux-high-ids/cpu/cpu0/online | 1 +
.../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 +
.../linux-high-ids/cpu/cpu1/online | 1 +
.../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 +
.../linux-high-ids/cpu/cpu10/online | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 | 1 +
.../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 +
.../linux-high-ids/node/node0/cpulist | 1 +
.../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 +
tests/virhostcputest.c | 1 +
103 files changed, 245 insertions(+)
create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
create mode 100644 tests/virhostcpudata/linux-aarch64-high-ids.expected
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
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
create mode 100644 tests/virhostcpudata/linux-high-ids/node/node0/cpulist
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
diff --git a/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo b/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
new file mode 100644
index 0000000000..a1ba0ebd73
--- /dev/null
+++ b/tests/virhostcpudata/linux-aarch64-high-ids.cpuinfo
@@ -0,0 +1,143 @@
+processor : 0
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 1
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 2
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 3
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 4
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 5
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 6
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 7
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 8
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 9
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 10
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 11
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 12
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 13
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 14
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
+
+processor : 15
+BogoMIPS : 100.00
+Features : fp asimd evtstrm cpuid
+CPU implementer : 0x50
+CPU architecture: 8
+CPU variant : 0x0
+CPU part : 0x000
+CPU revision : 1
diff --git a/tests/virhostcpudata/linux-aarch64-high-ids.expected b/tests/virhostcpudata/linux-aarch64-high-ids.expected
new file mode 100644
index 0000000000..27311eaf61
--- /dev/null
+++ b/tests/virhostcpudata/linux-aarch64-high-ids.expected
@@ -0,0 +1 @@
+CPUs: 16/16, MHz: 0, Nodes: 2, Sockets: 2, Cores: 2, Threads: 2
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
new file mode 100644
index 0000000000..40c7bb2f1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/core_siblings_list
@@ -0,0 +1 @@
+0-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/physical_package_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
new file mode 100644
index 0000000000..8b0fab869c
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu0/topology/thread_siblings_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
new file mode 100644
index 0000000000..40c7bb2f1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/core_siblings_list
@@ -0,0 +1 @@
+0-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/physical_package_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
new file mode 100644
index 0000000000..8b0fab869c
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu1/topology/thread_siblings_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
new file mode 100644
index 0000000000..6ae44fb498
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/core_siblings_list
@@ -0,0 +1 @@
+8-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/physical_package_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
new file mode 100644
index 0000000000..ac93dc4496
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu10/topology/thread_siblings_list
@@ -0,0 +1 @@
+10-11
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
new file mode 100644
index 0000000000..6ae44fb498
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/core_siblings_list
@@ -0,0 +1 @@
+8-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/physical_package_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
new file mode 100644
index 0000000000..ac93dc4496
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu11/topology/thread_siblings_list
@@ -0,0 +1 @@
+10-11
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
new file mode 100644
index 0000000000..5b8f3ea33e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/core_siblings_list
@@ -0,0 +1 @@
+12-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/physical_package_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
new file mode 100644
index 0000000000..a36c7a218d
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu12/topology/thread_siblings_list
@@ -0,0 +1 @@
+12-13
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
new file mode 100644
index 0000000000..5b8f3ea33e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/core_siblings_list
@@ -0,0 +1 @@
+12-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/physical_package_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
new file mode 100644
index 0000000000..a36c7a218d
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu13/topology/thread_siblings_list
@@ -0,0 +1 @@
+12-13
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
new file mode 100644
index 0000000000..5b8f3ea33e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/core_siblings_list
@@ -0,0 +1 @@
+12-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/physical_package_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
new file mode 100644
index 0000000000..0c53584319
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu14/topology/thread_siblings_list
@@ -0,0 +1 @@
+14-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
new file mode 100644
index 0000000000..5b8f3ea33e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/core_siblings_list
@@ -0,0 +1 @@
+12-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
new file mode 100644
index 0000000000..2b4009deaf
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/physical_package_id
@@ -0,0 +1 @@
+8191
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
new file mode 100644
index 0000000000..0c53584319
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu15/topology/thread_siblings_list
@@ -0,0 +1 @@
+14-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
new file mode 100644
index 0000000000..40c7bb2f1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/core_siblings_list
@@ -0,0 +1 @@
+0-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/physical_package_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
new file mode 100644
index 0000000000..7a9857542a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu2/topology/thread_siblings_list
@@ -0,0 +1 @@
+2-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
new file mode 100644
index 0000000000..40c7bb2f1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/core_siblings_list
@@ -0,0 +1 @@
+0-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/physical_package_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
new file mode 100644
index 0000000000..7a9857542a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu3/topology/thread_siblings_list
@@ -0,0 +1 @@
+2-3
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
new file mode 100644
index 0000000000..93fccd3cc6
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/core_siblings_list
@@ -0,0 +1 @@
+4-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/physical_package_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
new file mode 100644
index 0000000000..e66d883ade
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu4/topology/thread_siblings_list
@@ -0,0 +1 @@
+4-5
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
new file mode 100644
index 0000000000..93fccd3cc6
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/core_siblings_list
@@ -0,0 +1 @@
+4-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/physical_package_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
new file mode 100644
index 0000000000..e66d883ade
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu5/topology/thread_siblings_list
@@ -0,0 +1 @@
+4-5
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
new file mode 100644
index 0000000000..93fccd3cc6
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/core_siblings_list
@@ -0,0 +1 @@
+4-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/physical_package_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
new file mode 100644
index 0000000000..fdd9f37517
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu6/topology/thread_siblings_list
@@ -0,0 +1 @@
+6-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
new file mode 100644
index 0000000000..93fccd3cc6
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/core_siblings_list
@@ -0,0 +1 @@
+4-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
new file mode 100644
index 0000000000..50b0f79069
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/physical_package_id
@@ -0,0 +1 @@
+4095
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
new file mode 100644
index 0000000000..fdd9f37517
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu7/topology/thread_siblings_list
@@ -0,0 +1 @@
+6-7
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
new file mode 100644
index 0000000000..6ae44fb498
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/core_siblings_list
@@ -0,0 +1 @@
+8-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/physical_package_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
new file mode 100644
index 0000000000..63edceec1e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu8/topology/thread_siblings_list
@@ -0,0 +1 @@
+8-9
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
new file mode 100644
index 0000000000..b6ac305674
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_id
@@ -0,0 +1 @@
+2047
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
new file mode 100644
index 0000000000..6ae44fb498
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/core_siblings_list
@@ -0,0 +1 @@
+8-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
new file mode 100644
index 0000000000..3ad7f7faf5
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/physical_package_id
@@ -0,0 +1 @@
+6143
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
new file mode 100644
index 0000000000..63edceec1e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/cpu9/topology/thread_siblings_list
@@ -0,0 +1 @@
+8-9
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/online b/tests/virhostcpudata/linux-high-ids/cpu/online
new file mode 100644
index 0000000000..580a385a1d
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/online
@@ -0,0 +1 @@
+0-15
diff --git a/tests/virhostcpudata/linux-high-ids/cpu/present b/tests/virhostcpudata/linux-high-ids/cpu/present
new file mode 100644
index 0000000000..580a385a1d
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/cpu/present
@@ -0,0 +1 @@
+0-15
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu0 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu0
new file mode 120000
index 0000000000..c841bea28b
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu0
@@ -0,0 +1 @@
+../../cpu/cpu0
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu1 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu1
new file mode 120000
index 0000000000..5f4536279e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu1
@@ -0,0 +1 @@
+../../cpu/cpu1
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu2 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu2
new file mode 120000
index 0000000000..2dcca332ce
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu2
@@ -0,0 +1 @@
+../../cpu/cpu2
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu3 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu3
new file mode 120000
index 0000000000..c7690e5aa6
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu3
@@ -0,0 +1 @@
+../../cpu/cpu3
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu4 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu4
new file mode 120000
index 0000000000..9e77a64eb4
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu4
@@ -0,0 +1 @@
+../../cpu/cpu4
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu5 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu5
new file mode 120000
index 0000000000..cc07c3b97b
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu5
@@ -0,0 +1 @@
+../../cpu/cpu5
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu6 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu6
new file mode 120000
index 0000000000..2e7576354f
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu6
@@ -0,0 +1 @@
+../../cpu/cpu6
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpu7 b/tests/virhostcpudata/linux-high-ids/node/node0/cpu7
new file mode 120000
index 0000000000..09e3f79b43
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpu7
@@ -0,0 +1 @@
+../../cpu/cpu7
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node0/cpulist b/tests/virhostcpudata/linux-high-ids/node/node0/cpulist
new file mode 100644
index 0000000000..74fc2fb6b0
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node0/cpulist
@@ -0,0 +1 @@
+0-7
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu10 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu10
new file mode 120000
index 0000000000..a6dc6bb10e
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu10
@@ -0,0 +1 @@
+../../cpu/cpu10
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu11 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu11
new file mode 120000
index 0000000000..e29d898284
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu11
@@ -0,0 +1 @@
+../../cpu/cpu11
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu12 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu12
new file mode 120000
index 0000000000..211519e8ab
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu12
@@ -0,0 +1 @@
+../../cpu/cpu12
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu13 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu13
new file mode 120000
index 0000000000..52d3b6970d
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu13
@@ -0,0 +1 @@
+../../cpu/cpu13
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu14 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu14
new file mode 120000
index 0000000000..24cb3b4569
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu14
@@ -0,0 +1 @@
+../../cpu/cpu14
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu15 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu15
new file mode 120000
index 0000000000..e905d85e46
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu15
@@ -0,0 +1 @@
+../../cpu/cpu15
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu8 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu8
new file mode 120000
index 0000000000..bda10cc343
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu8
@@ -0,0 +1 @@
+../../cpu/cpu8
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpu9 b/tests/virhostcpudata/linux-high-ids/node/node1/cpu9
new file mode 120000
index 0000000000..1ec1db255a
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpu9
@@ -0,0 +1 @@
+../../cpu/cpu9
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-high-ids/node/node1/cpulist b/tests/virhostcpudata/linux-high-ids/node/node1/cpulist
new file mode 100644
index 0000000000..6ae44fb498
--- /dev/null
+++ b/tests/virhostcpudata/linux-high-ids/node/node1/cpulist
@@ -0,0 +1 @@
+8-15
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 091dd59b83..e9d237ae0e 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -240,6 +240,7 @@ mymain(void)
{"f21-mustang", VIR_ARCH_AARCH64},
{"rhelsa-3.19.0-mustang", VIR_ARCH_AARCH64},
{"rhel74-moonshot", VIR_ARCH_AARCH64},
+ {"high-ids", VIR_ARCH_AARCH64},
{"deconf-cpus", VIR_ARCH_PPC64},
/* subcores, default configuration */
{"subcores1", VIR_ARCH_PPC64},
--
2.18.0