render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
d76c62
From a3d3caef97d7f052187fce8f81527f9a9f1ae74f Mon Sep 17 00:00:00 2001
d76c62
Message-Id: <a3d3caef97d7f052187fce8f81527f9a9f1ae74f@dist-git>
d76c62
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
d76c62
Date: Mon, 3 Feb 2020 18:07:26 +0000
d76c62
Subject: [PATCH] tests: add host CPU data files for validating die_id
d76c62
MIME-Version: 1.0
d76c62
Content-Type: text/plain; charset=UTF-8
d76c62
Content-Transfer-Encoding: 8bit
d76c62
d76c62
Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
d76c62
right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
d76c62
kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
d76c62
a Fedora 31 QEMU guest launched with
d76c62
d76c62
 -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1
d76c62
d76c62
Ideally we'd replace this data with some from a real machine reporting
d76c62
"die_id", to ensure we're not mislead by QEMU's impl.
d76c62
d76c62
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
d76c62
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
d76c62
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
d76c62
(cherry picked from commit 0169f5ecdeefb91463b07a2e6f3f3b40c84323e9)
d76c62
d76c62
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785207
d76c62
BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1785211
d76c62
Message-Id: <20200203180726.2203691-6-berrange@redhat.com>
d76c62
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
d76c62
---
d76c62
 .../linux-basic-dies/system/cpu               |   1 +
d76c62
 .../linux-basic-dies/system/node              |   1 +
d76c62
 .../vircaps-x86_64-basic-dies.xml             |  35 ++
d76c62
 tests/vircaps2xmltest.c                       |   1 +
d76c62
 .../cpu/cpu0/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu0/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu0/topology/core_id  |   1 +
d76c62
 .../cpu/cpu0/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu0/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu0/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu0/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu0/topology/die_id   |   1 +
d76c62
 .../cpu/cpu0/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu0/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu0/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu0/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu0/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu1/online            |   1 +
d76c62
 .../cpu/cpu1/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu1/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu1/topology/core_id  |   1 +
d76c62
 .../cpu/cpu1/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu1/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu1/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu1/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu1/topology/die_id   |   1 +
d76c62
 .../cpu/cpu1/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu1/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu1/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu1/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu1/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu10/online           |   1 +
d76c62
 .../cpu/cpu10/topology/core_cpus              |   1 +
d76c62
 .../cpu/cpu10/topology/core_cpus_list         |   1 +
d76c62
 .../linux-with-die/cpu/cpu10/topology/core_id |   1 +
d76c62
 .../cpu/cpu10/topology/core_siblings          |   1 +
d76c62
 .../cpu/cpu10/topology/core_siblings_list     |   1 +
d76c62
 .../cpu/cpu10/topology/die_cpus               |   1 +
d76c62
 .../cpu/cpu10/topology/die_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu10/topology/die_id  |   1 +
d76c62
 .../cpu/cpu10/topology/package_cpus           |   1 +
d76c62
 .../cpu/cpu10/topology/package_cpus_list      |   1 +
d76c62
 .../cpu/cpu10/topology/physical_package_id    |   1 +
d76c62
 .../cpu/cpu10/topology/thread_siblings        |   1 +
d76c62
 .../cpu/cpu10/topology/thread_siblings_list   |   1 +
d76c62
 .../linux-with-die/cpu/cpu11/online           |   1 +
d76c62
 .../cpu/cpu11/topology/core_cpus              |   1 +
d76c62
 .../cpu/cpu11/topology/core_cpus_list         |   1 +
d76c62
 .../linux-with-die/cpu/cpu11/topology/core_id |   1 +
d76c62
 .../cpu/cpu11/topology/core_siblings          |   1 +
d76c62
 .../cpu/cpu11/topology/core_siblings_list     |   1 +
d76c62
 .../cpu/cpu11/topology/die_cpus               |   1 +
d76c62
 .../cpu/cpu11/topology/die_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu11/topology/die_id  |   1 +
d76c62
 .../cpu/cpu11/topology/package_cpus           |   1 +
d76c62
 .../cpu/cpu11/topology/package_cpus_list      |   1 +
d76c62
 .../cpu/cpu11/topology/physical_package_id    |   1 +
d76c62
 .../cpu/cpu11/topology/thread_siblings        |   1 +
d76c62
 .../cpu/cpu11/topology/thread_siblings_list   |   1 +
d76c62
 .../linux-with-die/cpu/cpu2/online            |   1 +
d76c62
 .../cpu/cpu2/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu2/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu2/topology/core_id  |   1 +
d76c62
 .../cpu/cpu2/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu2/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu2/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu2/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu2/topology/die_id   |   1 +
d76c62
 .../cpu/cpu2/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu2/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu2/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu2/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu2/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu3/online            |   1 +
d76c62
 .../cpu/cpu3/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu3/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu3/topology/core_id  |   1 +
d76c62
 .../cpu/cpu3/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu3/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu3/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu3/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu3/topology/die_id   |   1 +
d76c62
 .../cpu/cpu3/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu3/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu3/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu3/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu3/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu4/online            |   1 +
d76c62
 .../cpu/cpu4/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu4/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu4/topology/core_id  |   1 +
d76c62
 .../cpu/cpu4/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu4/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu4/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu4/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu4/topology/die_id   |   1 +
d76c62
 .../cpu/cpu4/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu4/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu4/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu4/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu4/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu5/online            |   1 +
d76c62
 .../cpu/cpu5/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu5/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu5/topology/core_id  |   1 +
d76c62
 .../cpu/cpu5/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu5/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu5/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu5/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu5/topology/die_id   |   1 +
d76c62
 .../cpu/cpu5/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu5/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu5/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu5/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu5/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu6/online            |   1 +
d76c62
 .../cpu/cpu6/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu6/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu6/topology/core_id  |   1 +
d76c62
 .../cpu/cpu6/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu6/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu6/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu6/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu6/topology/die_id   |   1 +
d76c62
 .../cpu/cpu6/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu6/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu6/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu6/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu6/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu7/online            |   1 +
d76c62
 .../cpu/cpu7/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu7/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu7/topology/core_id  |   1 +
d76c62
 .../cpu/cpu7/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu7/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu7/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu7/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu7/topology/die_id   |   1 +
d76c62
 .../cpu/cpu7/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu7/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu7/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu7/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu7/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu8/online            |   1 +
d76c62
 .../cpu/cpu8/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu8/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu8/topology/core_id  |   1 +
d76c62
 .../cpu/cpu8/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu8/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu8/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu8/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu8/topology/die_id   |   1 +
d76c62
 .../cpu/cpu8/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu8/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu8/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu8/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu8/topology/thread_siblings_list    |   1 +
d76c62
 .../linux-with-die/cpu/cpu9/online            |   1 +
d76c62
 .../cpu/cpu9/topology/core_cpus               |   1 +
d76c62
 .../cpu/cpu9/topology/core_cpus_list          |   1 +
d76c62
 .../linux-with-die/cpu/cpu9/topology/core_id  |   1 +
d76c62
 .../cpu/cpu9/topology/core_siblings           |   1 +
d76c62
 .../cpu/cpu9/topology/core_siblings_list      |   1 +
d76c62
 .../linux-with-die/cpu/cpu9/topology/die_cpus |   1 +
d76c62
 .../cpu/cpu9/topology/die_cpus_list           |   1 +
d76c62
 .../linux-with-die/cpu/cpu9/topology/die_id   |   1 +
d76c62
 .../cpu/cpu9/topology/package_cpus            |   1 +
d76c62
 .../cpu/cpu9/topology/package_cpus_list       |   1 +
d76c62
 .../cpu/cpu9/topology/physical_package_id     |   1 +
d76c62
 .../cpu/cpu9/topology/thread_siblings         |   1 +
d76c62
 .../cpu/cpu9/topology/thread_siblings_list    |   1 +
d76c62
 .../virhostcpudata/linux-with-die/cpu/online  |   1 +
d76c62
 .../virhostcpudata/linux-with-die/cpu/present |   1 +
d76c62
 .../linux-with-die/node/node0/cpu0            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu1            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu10           |   1 +
d76c62
 .../linux-with-die/node/node0/cpu11           |   1 +
d76c62
 .../linux-with-die/node/node0/cpu2            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu3            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu4            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu5            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu6            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu7            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu8            |   1 +
d76c62
 .../linux-with-die/node/node0/cpu9            |   1 +
d76c62
 .../linux-with-die/node/node0/cpulist         |   1 +
d76c62
 .../virhostcpudata/linux-with-die/node/online |   1 +
d76c62
 .../linux-with-die/node/possible              |   1 +
d76c62
 .../linux-x86_64-with-die.cpuinfo             | 323 ++++++++++++++++++
d76c62
 .../linux-x86_64-with-die.expected            |   1 +
d76c62
 tests/virhostcputest.c                        |   1 +
d76c62
 191 files changed, 547 insertions(+)
d76c62
 create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu
d76c62
 create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node
d76c62
 create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8
d76c62
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/node/online
d76c62
 create mode 100644 tests/virhostcpudata/linux-with-die/node/possible
d76c62
 create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
d76c62
 create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected
d76c62
d76c62
diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/cpu b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
d76c62
new file mode 120000
d76c62
index 0000000000..af158a7097
d76c62
--- /dev/null
d76c62
+++ b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
d76c62
@@ -0,0 +1 @@
d76c62
+../../../virhostcpudata/linux-with-die/cpu
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/node b/tests/vircaps2xmldata/linux-basic-dies/system/node
d76c62
new file mode 120000
d76c62
index 0000000000..68bc88ea14
d76c62
--- /dev/null
d76c62
+++ b/tests/vircaps2xmldata/linux-basic-dies/system/node
d76c62
@@ -0,0 +1 @@
d76c62
+../../../virhostcpudata/linux-with-die/node
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
d76c62
new file mode 100644
d76c62
index 0000000000..8a3ca2d13c
d76c62
--- /dev/null
d76c62
+++ b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
d76c62
@@ -0,0 +1,35 @@
d76c62
+<capabilities>
d76c62
+
d76c62
+  <host>
d76c62
+    <cpu>
d76c62
+      <arch>x86_64</arch>
d76c62
+    </cpu>
d76c62
+    <power_management/>
d76c62
+    <iommu support='no'/>
d76c62
+    <topology>
d76c62
+      <cells num='1'>
d76c62
+        <cell id='0'>
d76c62
+          <memory unit='KiB'>1048576</memory>
d76c62
+          <pages unit='KiB' size='4'>2048</pages>
d76c62
+          <pages unit='KiB' size='2048'>4096</pages>
d76c62
+          <pages unit='KiB' size='1048576'>6144</pages>
d76c62
+          <cpus num='12'>
d76c62
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
d76c62
+            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
d76c62
+            <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
d76c62
+            <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
d76c62
+            <cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/>
d76c62
+            <cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/>
d76c62
+            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
d76c62
+            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
d76c62
+            <cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/>
d76c62
+            <cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/>
d76c62
+            <cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/>
d76c62
+            <cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/>
d76c62
+          </cpus>
d76c62
+        </cell>
d76c62
+      </cells>
d76c62
+    </topology>
d76c62
+  </host>
d76c62
+
d76c62
+</capabilities>
d76c62
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
d76c62
index 6c08a26ec4..17cd600a7a 100644
d76c62
--- a/tests/vircaps2xmltest.c
d76c62
+++ b/tests/vircaps2xmltest.c
d76c62
@@ -102,6 +102,7 @@ mymain(void)
d76c62
 
d76c62
     DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
d76c62
     DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
d76c62
+    DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
d76c62
 
d76c62
     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
d76c62
 
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..5325a8dff7
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+001
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d7887218f9
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+003
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..8b0fab869c
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..5325a8dff7
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+001
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/online b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..5902f77e7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+002
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d7887218f9
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+003
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..8b0fab869c
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..5902f77e7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+002
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/online b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d411bb7c1a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+400
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..f599e28b8a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+10
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..a94266dd91
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+c00
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..ac93dc4496
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+10-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d411bb7c1a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+400
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..f599e28b8a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+10
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/online b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..5ae5aef844
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+800
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..b4de394767
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..a94266dd91
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+c00
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..ac93dc4496
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+10-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..5ae5aef844
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+800
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..b4de394767
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/online b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..8f3cca4f01
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+004
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..3138e83a00
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+00c
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..7a9857542a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+2-3
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..8f3cca4f01
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+004
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/online b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..e195199bee
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+008
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..00750edc07
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+3
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..3138e83a00
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+00c
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..7a9857542a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+2-3
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..e195199bee
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+008
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..00750edc07
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+3
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/online b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..9e8493eaee
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+010
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..b8626c4cff
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+4
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..cadb715e0d
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+030
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..e66d883ade
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+4-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..9e8493eaee
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+010
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..b8626c4cff
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+4
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/online b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..fb6187e9e0
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+020
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..7ed6ff82de
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..cadb715e0d
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+030
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..e66d883ade
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+4-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..0cfbf08886
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+2
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..d37ac748bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+03f
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..82a99f2907
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+0-5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..fb6187e9e0
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+020
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..7ed6ff82de
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+5
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/online b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..9070bc3017
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+040
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..1e8b314962
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..8f0552ead0
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+0c0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fdd9f37517
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-7
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..9070bc3017
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+040
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..1e8b314962
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/online b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..fa5c7835bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+080
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..7f8f011eb7
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+7
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..8f0552ead0
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+0c0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fdd9f37517
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-7
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..fa5c7835bd
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+080
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..7f8f011eb7
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+7
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/online b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..29d6383b52
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+100
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..45a4fb75db
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+8
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..697cb3a26d
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+300
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..63edceec1e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+8-9
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..29d6383b52
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+100
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..45a4fb75db
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+8
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/online b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..08839f6bb2
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+200
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..ec635144f6
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+9
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..697cb3a26d
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+300
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..63edceec1e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+8-9
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
d76c62
new file mode 100644
d76c62
index 0000000000..6c3274debe
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
d76c62
@@ -0,0 +1 @@
d76c62
+fc0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
d76c62
new file mode 100644
d76c62
index 0000000000..fd6c445982
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
d76c62
@@ -0,0 +1 @@
d76c62
+6-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
d76c62
new file mode 100644
d76c62
index 0000000000..d00491fd7e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
d76c62
@@ -0,0 +1 @@
d76c62
+1
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
d76c62
new file mode 100644
d76c62
index 0000000000..08839f6bb2
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
d76c62
@@ -0,0 +1 @@
d76c62
+200
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
d76c62
new file mode 100644
d76c62
index 0000000000..ec635144f6
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
d76c62
@@ -0,0 +1 @@
d76c62
+9
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/online b/tests/virhostcpudata/linux-with-die/cpu/online
d76c62
new file mode 100644
d76c62
index 0000000000..536e621dcc
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/online
d76c62
@@ -0,0 +1 @@
d76c62
+0-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/cpu/present b/tests/virhostcpudata/linux-with-die/cpu/present
d76c62
new file mode 100644
d76c62
index 0000000000..536e621dcc
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/cpu/present
d76c62
@@ -0,0 +1 @@
d76c62
+0-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu0 b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
d76c62
new file mode 120000
d76c62
index 0000000000..c841bea28b
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu0
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu1 b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
d76c62
new file mode 120000
d76c62
index 0000000000..5f4536279e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu1
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu10 b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
d76c62
new file mode 120000
d76c62
index 0000000000..a6dc6bb10e
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu10
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu11 b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
d76c62
new file mode 120000
d76c62
index 0000000000..e29d898284
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu11
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu2 b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
d76c62
new file mode 120000
d76c62
index 0000000000..2dcca332ce
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu2
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu3 b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
d76c62
new file mode 120000
d76c62
index 0000000000..c7690e5aa6
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu3
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu4 b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
d76c62
new file mode 120000
d76c62
index 0000000000..9e77a64eb4
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu4
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu5 b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
d76c62
new file mode 120000
d76c62
index 0000000000..cc07c3b97b
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu5
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu6 b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
d76c62
new file mode 120000
d76c62
index 0000000000..2e7576354f
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu6
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu7 b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
d76c62
new file mode 120000
d76c62
index 0000000000..09e3f79b43
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu7
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu8 b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
d76c62
new file mode 120000
d76c62
index 0000000000..bda10cc343
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu8
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu9 b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
d76c62
new file mode 120000
d76c62
index 0000000000..1ec1db255a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
d76c62
@@ -0,0 +1 @@
d76c62
+../../cpu/cpu9
d76c62
\ No newline at end of file
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpulist b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
d76c62
new file mode 100644
d76c62
index 0000000000..536e621dcc
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
d76c62
@@ -0,0 +1 @@
d76c62
+0-11
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/online b/tests/virhostcpudata/linux-with-die/node/online
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/online
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-with-die/node/possible b/tests/virhostcpudata/linux-with-die/node/possible
d76c62
new file mode 100644
d76c62
index 0000000000..573541ac97
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-with-die/node/possible
d76c62
@@ -0,0 +1 @@
d76c62
+0
d76c62
diff --git a/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
d76c62
new file mode 100644
d76c62
index 0000000000..f57be77f0c
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
d76c62
@@ -0,0 +1,323 @@
d76c62
+processor	: 0
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 0
d76c62
+initial apicid	: 0
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 1
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 1
d76c62
+initial apicid	: 1
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 2
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 2
d76c62
+initial apicid	: 2
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 3
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 3
d76c62
+initial apicid	: 3
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 4
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 4
d76c62
+initial apicid	: 4
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 5
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 0
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 5
d76c62
+initial apicid	: 5
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 6
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 8
d76c62
+initial apicid	: 8
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 7
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 9
d76c62
+initial apicid	: 9
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 8
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 10
d76c62
+initial apicid	: 10
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 9
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 11
d76c62
+initial apicid	: 11
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 10
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 0
d76c62
+cpu cores	: 6
d76c62
+apicid		: 12
d76c62
+initial apicid	: 12
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
+
d76c62
+processor	: 11
d76c62
+vendor_id	: GenuineIntel
d76c62
+cpu family	: 6
d76c62
+model		: 6
d76c62
+model name	: QEMU Virtual CPU version 2.5+
d76c62
+stepping	: 3
d76c62
+microcode	: 0x1
d76c62
+cpu MHz		: 1897.801
d76c62
+cache size	: 16384 KB
d76c62
+physical id	: 1
d76c62
+siblings	: 6
d76c62
+core id		: 1
d76c62
+cpu cores	: 6
d76c62
+apicid		: 13
d76c62
+initial apicid	: 13
d76c62
+fpu		: yes
d76c62
+fpu_exception	: yes
d76c62
+cpuid level	: 31
d76c62
+wp		: yes
d76c62
+flags		: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 ht syscall nx lm rep_good nopl xtopology cpuid tsc_known_freq pni cx16 x2apic hypervisor lahf_lm cpuid_fault pti
d76c62
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
d76c62
+bogomips	: 3795.60
d76c62
+clflush size	: 64
d76c62
+cache_alignment	: 64
d76c62
+address sizes	: 40 bits physical, 48 bits virtual
d76c62
+power management:
d76c62
diff --git a/tests/virhostcpudata/linux-x86_64-with-die.expected b/tests/virhostcpudata/linux-x86_64-with-die.expected
d76c62
new file mode 100644
d76c62
index 0000000000..3c045f483a
d76c62
--- /dev/null
d76c62
+++ b/tests/virhostcpudata/linux-x86_64-with-die.expected
d76c62
@@ -0,0 +1 @@
d76c62
+CPUs: 12/12, MHz: 1897, Nodes: 1, Sockets: 1, Cores: 12, Threads: 1
d76c62
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
d76c62
index 05c6f5acfb..7865b61578 100644
d76c62
--- a/tests/virhostcputest.c
d76c62
+++ b/tests/virhostcputest.c
d76c62
@@ -248,6 +248,7 @@ mymain(void)
d76c62
         /* subcores, invalid configuration */
d76c62
         {"subcores3", VIR_ARCH_PPC64},
d76c62
         {"with-frequency", VIR_ARCH_S390X},
d76c62
+        {"with-die", VIR_ARCH_X86_64},
d76c62
     };
d76c62
 
d76c62
     if (virInitialize() < 0)
d76c62
-- 
d76c62
2.25.0
d76c62