[libvirt] [PATCH 5/5] tests: add host CPU data files for validating die_id

Thu Dec 19 12:42:08 UTC 2019

Only Cascadelake-AP CPUs appear to report "die_id" values != 0 on Linux
right now - AMD EPYC's don't report "die_id" (at least with Fedora 31
kernel). Lacking access to Cascadelake-AP CPUs, this test data was from
a Fedora 31 QEMU guest launched with

 -cpu qemu64 -smp sockets=2,dies=3,cores=2,threads=1

Ideally we'd replace this data with some from a real machine reporting
"die_id", to ensure we're not mislead by QEMU's impl.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 .../linux-basic-dies/system/cpu               |   1 +
 .../linux-basic-dies/system/node              |   1 +
 .../vircaps-x86_64-basic-dies.xml             |  35 ++
 tests/vircaps2xmltest.c                       |   1 +
 .../cpu/cpu0/topology/core_cpus               |   1 +
 .../cpu/cpu0/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu0/topology/core_id  |   1 +
 .../cpu/cpu0/topology/core_siblings           |   1 +
 .../cpu/cpu0/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu0/topology/die_cpus |   1 +
 .../cpu/cpu0/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu0/topology/die_id   |   1 +
 .../cpu/cpu0/topology/package_cpus            |   1 +
 .../cpu/cpu0/topology/package_cpus_list       |   1 +
 .../cpu/cpu0/topology/physical_package_id     |   1 +
 .../cpu/cpu0/topology/thread_siblings         |   1 +
 .../cpu/cpu0/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu1/online            |   1 +
 .../cpu/cpu1/topology/core_cpus               |   1 +
 .../cpu/cpu1/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu1/topology/core_id  |   1 +
 .../cpu/cpu1/topology/core_siblings           |   1 +
 .../cpu/cpu1/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu1/topology/die_cpus |   1 +
 .../cpu/cpu1/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu1/topology/die_id   |   1 +
 .../cpu/cpu1/topology/package_cpus            |   1 +
 .../cpu/cpu1/topology/package_cpus_list       |   1 +
 .../cpu/cpu1/topology/physical_package_id     |   1 +
 .../cpu/cpu1/topology/thread_siblings         |   1 +
 .../cpu/cpu1/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu10/online           |   1 +
 .../cpu/cpu10/topology/core_cpus              |   1 +
 .../cpu/cpu10/topology/core_cpus_list         |   1 +
 .../linux-with-die/cpu/cpu10/topology/core_id |   1 +
 .../cpu/cpu10/topology/core_siblings          |   1 +
 .../cpu/cpu10/topology/core_siblings_list     |   1 +
 .../cpu/cpu10/topology/die_cpus               |   1 +
 .../cpu/cpu10/topology/die_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu10/topology/die_id  |   1 +
 .../cpu/cpu10/topology/package_cpus           |   1 +
 .../cpu/cpu10/topology/package_cpus_list      |   1 +
 .../cpu/cpu10/topology/physical_package_id    |   1 +
 .../cpu/cpu10/topology/thread_siblings        |   1 +
 .../cpu/cpu10/topology/thread_siblings_list   |   1 +
 .../linux-with-die/cpu/cpu11/online           |   1 +
 .../cpu/cpu11/topology/core_cpus              |   1 +
 .../cpu/cpu11/topology/core_cpus_list         |   1 +
 .../linux-with-die/cpu/cpu11/topology/core_id |   1 +
 .../cpu/cpu11/topology/core_siblings          |   1 +
 .../cpu/cpu11/topology/core_siblings_list     |   1 +
 .../cpu/cpu11/topology/die_cpus               |   1 +
 .../cpu/cpu11/topology/die_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu11/topology/die_id  |   1 +
 .../cpu/cpu11/topology/package_cpus           |   1 +
 .../cpu/cpu11/topology/package_cpus_list      |   1 +
 .../cpu/cpu11/topology/physical_package_id    |   1 +
 .../cpu/cpu11/topology/thread_siblings        |   1 +
 .../cpu/cpu11/topology/thread_siblings_list   |   1 +
 .../linux-with-die/cpu/cpu2/online            |   1 +
 .../cpu/cpu2/topology/core_cpus               |   1 +
 .../cpu/cpu2/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu2/topology/core_id  |   1 +
 .../cpu/cpu2/topology/core_siblings           |   1 +
 .../cpu/cpu2/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu2/topology/die_cpus |   1 +
 .../cpu/cpu2/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu2/topology/die_id   |   1 +
 .../cpu/cpu2/topology/package_cpus            |   1 +
 .../cpu/cpu2/topology/package_cpus_list       |   1 +
 .../cpu/cpu2/topology/physical_package_id     |   1 +
 .../cpu/cpu2/topology/thread_siblings         |   1 +
 .../cpu/cpu2/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu3/online            |   1 +
 .../cpu/cpu3/topology/core_cpus               |   1 +
 .../cpu/cpu3/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu3/topology/core_id  |   1 +
 .../cpu/cpu3/topology/core_siblings           |   1 +
 .../cpu/cpu3/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu3/topology/die_cpus |   1 +
 .../cpu/cpu3/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu3/topology/die_id   |   1 +
 .../cpu/cpu3/topology/package_cpus            |   1 +
 .../cpu/cpu3/topology/package_cpus_list       |   1 +
 .../cpu/cpu3/topology/physical_package_id     |   1 +
 .../cpu/cpu3/topology/thread_siblings         |   1 +
 .../cpu/cpu3/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu4/online            |   1 +
 .../cpu/cpu4/topology/core_cpus               |   1 +
 .../cpu/cpu4/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu4/topology/core_id  |   1 +
 .../cpu/cpu4/topology/core_siblings           |   1 +
 .../cpu/cpu4/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu4/topology/die_cpus |   1 +
 .../cpu/cpu4/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu4/topology/die_id   |   1 +
 .../cpu/cpu4/topology/package_cpus            |   1 +
 .../cpu/cpu4/topology/package_cpus_list       |   1 +
 .../cpu/cpu4/topology/physical_package_id     |   1 +
 .../cpu/cpu4/topology/thread_siblings         |   1 +
 .../cpu/cpu4/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu5/online            |   1 +
 .../cpu/cpu5/topology/core_cpus               |   1 +
 .../cpu/cpu5/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu5/topology/core_id  |   1 +
 .../cpu/cpu5/topology/core_siblings           |   1 +
 .../cpu/cpu5/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu5/topology/die_cpus |   1 +
 .../cpu/cpu5/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu5/topology/die_id   |   1 +
 .../cpu/cpu5/topology/package_cpus            |   1 +
 .../cpu/cpu5/topology/package_cpus_list       |   1 +
 .../cpu/cpu5/topology/physical_package_id     |   1 +
 .../cpu/cpu5/topology/thread_siblings         |   1 +
 .../cpu/cpu5/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu6/online            |   1 +
 .../cpu/cpu6/topology/core_cpus               |   1 +
 .../cpu/cpu6/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu6/topology/core_id  |   1 +
 .../cpu/cpu6/topology/core_siblings           |   1 +
 .../cpu/cpu6/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu6/topology/die_cpus |   1 +
 .../cpu/cpu6/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu6/topology/die_id   |   1 +
 .../cpu/cpu6/topology/package_cpus            |   1 +
 .../cpu/cpu6/topology/package_cpus_list       |   1 +
 .../cpu/cpu6/topology/physical_package_id     |   1 +
 .../cpu/cpu6/topology/thread_siblings         |   1 +
 .../cpu/cpu6/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu7/online            |   1 +
 .../cpu/cpu7/topology/core_cpus               |   1 +
 .../cpu/cpu7/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu7/topology/core_id  |   1 +
 .../cpu/cpu7/topology/core_siblings           |   1 +
 .../cpu/cpu7/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu7/topology/die_cpus |   1 +
 .../cpu/cpu7/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu7/topology/die_id   |   1 +
 .../cpu/cpu7/topology/package_cpus            |   1 +
 .../cpu/cpu7/topology/package_cpus_list       |   1 +
 .../cpu/cpu7/topology/physical_package_id     |   1 +
 .../cpu/cpu7/topology/thread_siblings         |   1 +
 .../cpu/cpu7/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu8/online            |   1 +
 .../cpu/cpu8/topology/core_cpus               |   1 +
 .../cpu/cpu8/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu8/topology/core_id  |   1 +
 .../cpu/cpu8/topology/core_siblings           |   1 +
 .../cpu/cpu8/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu8/topology/die_cpus |   1 +
 .../cpu/cpu8/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu8/topology/die_id   |   1 +
 .../cpu/cpu8/topology/package_cpus            |   1 +
 .../cpu/cpu8/topology/package_cpus_list       |   1 +
 .../cpu/cpu8/topology/physical_package_id     |   1 +
 .../cpu/cpu8/topology/thread_siblings         |   1 +
 .../cpu/cpu8/topology/thread_siblings_list    |   1 +
 .../linux-with-die/cpu/cpu9/online            |   1 +
 .../cpu/cpu9/topology/core_cpus               |   1 +
 .../cpu/cpu9/topology/core_cpus_list          |   1 +
 .../linux-with-die/cpu/cpu9/topology/core_id  |   1 +
 .../cpu/cpu9/topology/core_siblings           |   1 +
 .../cpu/cpu9/topology/core_siblings_list      |   1 +
 .../linux-with-die/cpu/cpu9/topology/die_cpus |   1 +
 .../cpu/cpu9/topology/die_cpus_list           |   1 +
 .../linux-with-die/cpu/cpu9/topology/die_id   |   1 +
 .../cpu/cpu9/topology/package_cpus            |   1 +
 .../cpu/cpu9/topology/package_cpus_list       |   1 +
 .../cpu/cpu9/topology/physical_package_id     |   1 +
 .../cpu/cpu9/topology/thread_siblings         |   1 +
 .../cpu/cpu9/topology/thread_siblings_list    |   1 +
 .../virhostcpudata/linux-with-die/cpu/online  |   1 +
 .../virhostcpudata/linux-with-die/cpu/present |   1 +
 .../linux-with-die/node/node0/cpu0            |   1 +
 .../linux-with-die/node/node0/cpu1            |   1 +
 .../linux-with-die/node/node0/cpu10           |   1 +
 .../linux-with-die/node/node0/cpu11           |   1 +
 .../linux-with-die/node/node0/cpu2            |   1 +
 .../linux-with-die/node/node0/cpu3            |   1 +
 .../linux-with-die/node/node0/cpu4            |   1 +
 .../linux-with-die/node/node0/cpu5            |   1 +
 .../linux-with-die/node/node0/cpu6            |   1 +
 .../linux-with-die/node/node0/cpu7            |   1 +
 .../linux-with-die/node/node0/cpu8            |   1 +
 .../linux-with-die/node/node0/cpu9            |   1 +
 .../linux-with-die/node/node0/cpulist         |   1 +
 .../virhostcpudata/linux-with-die/node/online |   1 +
 .../linux-with-die/node/possible              |   1 +
 .../linux-x86_64-with-die.cpuinfo             | 324 ++++++++++++++++++
 .../linux-x86_64-with-die.expected            |   1 +
 tests/virhostcputest.c                        |   1 +
 191 files changed, 548 insertions(+)
 create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/cpu
 create mode 120000 tests/vircaps2xmldata/linux-basic-dies/system/node
 create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/online
 create mode 100644 tests/virhostcpudata/linux-with-die/cpu/present
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu0
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu1
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu10
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu11
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu2
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu3
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu4
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu5
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu6
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu7
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu8
 create mode 120000 tests/virhostcpudata/linux-with-die/node/node0/cpu9
 create mode 100644 tests/virhostcpudata/linux-with-die/node/node0/cpulist
 create mode 100644 tests/virhostcpudata/linux-with-die/node/online
 create mode 100644 tests/virhostcpudata/linux-with-die/node/possible
 create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
 create mode 100644 tests/virhostcpudata/linux-x86_64-with-die.expected

diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/cpu b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
new file mode 120000
index 0000000000..af158a7097
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-basic-dies/system/cpu
@@ -0,0 +1 @@
+../../../virhostcpudata/linux-with-die/cpu
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/linux-basic-dies/system/node b/tests/vircaps2xmldata/linux-basic-dies/system/node
new file mode 120000
index 0000000000..68bc88ea14
--- /dev/null
+++ b/tests/vircaps2xmldata/linux-basic-dies/system/node
@@ -0,0 +1 @@
+../../../virhostcpudata/linux-with-die/node
\ No newline at end of file
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
new file mode 100644
index 0000000000..8a3ca2d13c
--- /dev/null
+++ b/tests/vircaps2xmldata/vircaps-x86_64-basic-dies.xml
@@ -0,0 +1,35 @@
+<capabilities>
+
+  <host>
+    <cpu>
+      <arch>x86_64</arch>
+    </cpu>
+    <power_management/>
+    <iommu support='no'/>
+    <topology>
+      <cells num='1'>
+        <cell id='0'>
+          <memory unit='KiB'>1048576</memory>
+          <pages unit='KiB' size='4'>2048</pages>
+          <pages unit='KiB' size='2048'>4096</pages>
+          <pages unit='KiB' size='1048576'>6144</pages>
+          <cpus num='12'>
+            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+            <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1'/>
+            <cpu id='2' socket_id='0' die_id='1' core_id='0' siblings='2'/>
+            <cpu id='3' socket_id='0' die_id='1' core_id='1' siblings='3'/>
+            <cpu id='4' socket_id='0' die_id='2' core_id='0' siblings='4'/>
+            <cpu id='5' socket_id='0' die_id='2' core_id='1' siblings='5'/>
+            <cpu id='6' socket_id='1' die_id='0' core_id='0' siblings='6'/>
+            <cpu id='7' socket_id='1' die_id='0' core_id='1' siblings='7'/>
+            <cpu id='8' socket_id='1' die_id='1' core_id='0' siblings='8'/>
+            <cpu id='9' socket_id='1' die_id='1' core_id='1' siblings='9'/>
+            <cpu id='10' socket_id='1' die_id='2' core_id='0' siblings='10'/>
+            <cpu id='11' socket_id='1' die_id='2' core_id='1' siblings='11'/>
+          </cpus>
+        </cell>
+      </cells>
+    </topology>
+  </host>
+
+</capabilities>
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index 6c08a26ec4..17cd600a7a 100644
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -102,6 +102,7 @@ mymain(void)
 
     DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
     DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
+    DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
 
     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
 
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
new file mode 100644
index 0000000000..5325a8dff7
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus
@@ -0,0 +1 @@
+001
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_cpus_list
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
new file mode 100644
index 0000000000..d7887218f9
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus
@@ -0,0 +1 @@
+003
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
new file mode 100644
index 0000000000..8b0fab869c
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_cpus_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
new file mode 100644
index 0000000000..5325a8dff7
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings
@@ -0,0 +1 @@
+001
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu0/topology/thread_siblings_list
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/online b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
new file mode 100644
index 0000000000..5902f77e7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus
@@ -0,0 +1 @@
+002
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_cpus_list
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
new file mode 100644
index 0000000000..d7887218f9
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus
@@ -0,0 +1 @@
+003
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
new file mode 100644
index 0000000000..8b0fab869c
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_cpus_list
@@ -0,0 +1 @@
+0-1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
new file mode 100644
index 0000000000..5902f77e7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings
@@ -0,0 +1 @@
+002
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu1/topology/thread_siblings_list
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/online b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
new file mode 100644
index 0000000000..d411bb7c1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus
@@ -0,0 +1 @@
+400
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
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_cpus_list
@@ -0,0 +1 @@
+10
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
new file mode 100644
index 0000000000..a94266dd91
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus
@@ -0,0 +1 @@
+c00
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
new file mode 100644
index 0000000000..ac93dc4496
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_cpus_list
@@ -0,0 +1 @@
+10-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/die_id
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
new file mode 100644
index 0000000000..d411bb7c1a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings
@@ -0,0 +1 @@
+400
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
new file mode 100644
index 0000000000..f599e28b8a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu10/topology/thread_siblings_list
@@ -0,0 +1 @@
+10
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/online b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
new file mode 100644
index 0000000000..5ae5aef844
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus
@@ -0,0 +1 @@
+800
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
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_cpus_list
@@ -0,0 +1 @@
+11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
new file mode 100644
index 0000000000..a94266dd91
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus
@@ -0,0 +1 @@
+c00
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
new file mode 100644
index 0000000000..ac93dc4496
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_cpus_list
@@ -0,0 +1 @@
+10-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/die_id
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
new file mode 100644
index 0000000000..5ae5aef844
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings
@@ -0,0 +1 @@
+800
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
new file mode 100644
index 0000000000..b4de394767
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu11/topology/thread_siblings_list
@@ -0,0 +1 @@
+11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/online b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
new file mode 100644
index 0000000000..8f3cca4f01
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus
@@ -0,0 +1 @@
+004
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
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_cpus_list
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
new file mode 100644
index 0000000000..3138e83a00
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus
@@ -0,0 +1 @@
+00c
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
new file mode 100644
index 0000000000..7a9857542a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_cpus_list
@@ -0,0 +1 @@
+2-3
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/die_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
new file mode 100644
index 0000000000..8f3cca4f01
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings
@@ -0,0 +1 @@
+004
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
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu2/topology/thread_siblings_list
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/online b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
new file mode 100644
index 0000000000..e195199bee
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus
@@ -0,0 +1 @@
+008
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
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_cpus_list
@@ -0,0 +1 @@
+3
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
new file mode 100644
index 0000000000..3138e83a00
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus
@@ -0,0 +1 @@
+00c
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
new file mode 100644
index 0000000000..7a9857542a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_cpus_list
@@ -0,0 +1 @@
+2-3
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/die_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
new file mode 100644
index 0000000000..e195199bee
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings
@@ -0,0 +1 @@
+008
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
new file mode 100644
index 0000000000..00750edc07
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu3/topology/thread_siblings_list
@@ -0,0 +1 @@
+3
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/online b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
new file mode 100644
index 0000000000..9e8493eaee
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus
@@ -0,0 +1 @@
+010
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
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_cpus_list
@@ -0,0 +1 @@
+4
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
new file mode 100644
index 0000000000..cadb715e0d
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus
@@ -0,0 +1 @@
+030
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
new file mode 100644
index 0000000000..e66d883ade
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_cpus_list
@@ -0,0 +1 @@
+4-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/die_id
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
new file mode 100644
index 0000000000..9e8493eaee
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings
@@ -0,0 +1 @@
+010
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
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu4/topology/thread_siblings_list
@@ -0,0 +1 @@
+4
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/online b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
new file mode 100644
index 0000000000..fb6187e9e0
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus
@@ -0,0 +1 @@
+020
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
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_cpus_list
@@ -0,0 +1 @@
+5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/core_siblings_list
@@ -0,0 +1 @@
+0-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
new file mode 100644
index 0000000000..cadb715e0d
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus
@@ -0,0 +1 @@
+030
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
new file mode 100644
index 0000000000..e66d883ade
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_cpus_list
@@ -0,0 +1 @@
+4-5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
new file mode 100644
index 0000000000..0cfbf08886
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/die_id
@@ -0,0 +1 @@
+2
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
new file mode 100644
index 0000000000..d37ac748bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus
@@ -0,0 +1 @@
+03f
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
new file mode 100644
index 0000000000..82a99f2907
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/package_cpus_list
@@ -0,0 +1 @@
+0-5
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
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/physical_package_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
new file mode 100644
index 0000000000..fb6187e9e0
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings
@@ -0,0 +1 @@
+020
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
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu5/topology/thread_siblings_list
@@ -0,0 +1 @@
+5
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/online b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
new file mode 100644
index 0000000000..9070bc3017
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus
@@ -0,0 +1 @@
+040
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
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_cpus_list
@@ -0,0 +1 @@
+6
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
new file mode 100644
index 0000000000..8f0552ead0
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus
@@ -0,0 +1 @@
+0c0
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
new file mode 100644
index 0000000000..fdd9f37517
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_cpus_list
@@ -0,0 +1 @@
+6-7
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
new file mode 100644
index 0000000000..9070bc3017
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings
@@ -0,0 +1 @@
+040
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
new file mode 100644
index 0000000000..1e8b314962
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu6/topology/thread_siblings_list
@@ -0,0 +1 @@
+6
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/online b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
new file mode 100644
index 0000000000..fa5c7835bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus
@@ -0,0 +1 @@
+080
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
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_cpus_list
@@ -0,0 +1 @@
+7
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
new file mode 100644
index 0000000000..8f0552ead0
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus
@@ -0,0 +1 @@
+0c0
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
new file mode 100644
index 0000000000..fdd9f37517
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_cpus_list
@@ -0,0 +1 @@
+6-7
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/die_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
new file mode 100644
index 0000000000..fa5c7835bd
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings
@@ -0,0 +1 @@
+080
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
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu7/topology/thread_siblings_list
@@ -0,0 +1 @@
+7
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/online b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
new file mode 100644
index 0000000000..29d6383b52
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus
@@ -0,0 +1 @@
+100
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
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_cpus_list
@@ -0,0 +1 @@
+8
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_id
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
new file mode 100644
index 0000000000..697cb3a26d
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus
@@ -0,0 +1 @@
+300
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
new file mode 100644
index 0000000000..63edceec1e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_cpus_list
@@ -0,0 +1 @@
+8-9
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/die_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
new file mode 100644
index 0000000000..29d6383b52
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings
@@ -0,0 +1 @@
+100
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
new file mode 100644
index 0000000000..45a4fb75db
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu8/topology/thread_siblings_list
@@ -0,0 +1 @@
+8
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/online b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/online
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
new file mode 100644
index 0000000000..08839f6bb2
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus
@@ -0,0 +1 @@
+200
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
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_cpus_list
@@ -0,0 +1 @@
+9
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/core_siblings_list
@@ -0,0 +1 @@
+6-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
new file mode 100644
index 0000000000..697cb3a26d
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus
@@ -0,0 +1 @@
+300
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
new file mode 100644
index 0000000000..63edceec1e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_cpus_list
@@ -0,0 +1 @@
+8-9
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/die_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
new file mode 100644
index 0000000000..6c3274debe
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus
@@ -0,0 +1 @@
+fc0
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
new file mode 100644
index 0000000000..fd6c445982
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/package_cpus_list
@@ -0,0 +1 @@
+6-11
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
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/physical_package_id
@@ -0,0 +1 @@
+1
diff --git a/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
new file mode 100644
index 0000000000..08839f6bb2
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings
@@ -0,0 +1 @@
+200
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
new file mode 100644
index 0000000000..ec635144f6
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/cpu9/topology/thread_siblings_list
@@ -0,0 +1 @@
+9
diff --git a/tests/virhostcpudata/linux-with-die/cpu/online b/tests/virhostcpudata/linux-with-die/cpu/online
new file mode 100644
index 0000000000..536e621dcc
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/online
@@ -0,0 +1 @@
+0-11
diff --git a/tests/virhostcpudata/linux-with-die/cpu/present b/tests/virhostcpudata/linux-with-die/cpu/present
new file mode 100644
index 0000000000..536e621dcc
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/cpu/present
@@ -0,0 +1 @@
+0-11
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu0 b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
new file mode 120000
index 0000000000..c841bea28b
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu0
@@ -0,0 +1 @@
+../../cpu/cpu0
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu1 b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
new file mode 120000
index 0000000000..5f4536279e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu1
@@ -0,0 +1 @@
+../../cpu/cpu1
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu10 b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
new file mode 120000
index 0000000000..a6dc6bb10e
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu10
@@ -0,0 +1 @@
+../../cpu/cpu10
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu11 b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
new file mode 120000
index 0000000000..e29d898284
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu11
@@ -0,0 +1 @@
+../../cpu/cpu11
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu2 b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
new file mode 120000
index 0000000000..2dcca332ce
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu2
@@ -0,0 +1 @@
+../../cpu/cpu2
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu3 b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
new file mode 120000
index 0000000000..c7690e5aa6
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu3
@@ -0,0 +1 @@
+../../cpu/cpu3
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu4 b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
new file mode 120000
index 0000000000..9e77a64eb4
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu4
@@ -0,0 +1 @@
+../../cpu/cpu4
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu5 b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
new file mode 120000
index 0000000000..cc07c3b97b
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu5
@@ -0,0 +1 @@
+../../cpu/cpu5
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu6 b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
new file mode 120000
index 0000000000..2e7576354f
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu6
@@ -0,0 +1 @@
+../../cpu/cpu6
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu7 b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
new file mode 120000
index 0000000000..09e3f79b43
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu7
@@ -0,0 +1 @@
+../../cpu/cpu7
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu8 b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
new file mode 120000
index 0000000000..bda10cc343
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu8
@@ -0,0 +1 @@
+../../cpu/cpu8
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpu9 b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
new file mode 120000
index 0000000000..1ec1db255a
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpu9
@@ -0,0 +1 @@
+../../cpu/cpu9
\ No newline at end of file
diff --git a/tests/virhostcpudata/linux-with-die/node/node0/cpulist b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
new file mode 100644
index 0000000000..536e621dcc
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/node0/cpulist
@@ -0,0 +1 @@
+0-11
diff --git a/tests/virhostcpudata/linux-with-die/node/online b/tests/virhostcpudata/linux-with-die/node/online
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/online
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-with-die/node/possible b/tests/virhostcpudata/linux-with-die/node/possible
new file mode 100644
index 0000000000..573541ac97
--- /dev/null
+++ b/tests/virhostcpudata/linux-with-die/node/possible
@@ -0,0 +1 @@
+0
diff --git a/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
new file mode 100644
index 0000000000..027dc6a037
--- /dev/null
+++ b/tests/virhostcpudata/linux-x86_64-with-die.cpuinfo
@@ -0,0 +1,324 @@
+processor	: 0
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 0
+initial apicid	: 0
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 1
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 1
+initial apicid	: 1
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 2
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 2
+initial apicid	: 2
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 3
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 3
+initial apicid	: 3
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 4
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 4
+initial apicid	: 4
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 5
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 0
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 5
+initial apicid	: 5
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 6
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 8
+initial apicid	: 8
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 7
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 9
+initial apicid	: 9
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 8
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 10
+initial apicid	: 10
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 9
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 11
+initial apicid	: 11
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 10
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 0
+cpu cores	: 6
+apicid		: 12
+initial apicid	: 12
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
+processor	: 11
+vendor_id	: GenuineIntel
+cpu family	: 6
+model		: 6
+model name	: QEMU Virtual CPU version 2.5+
+stepping	: 3
+microcode	: 0x1
+cpu MHz		: 1897.801
+cache size	: 16384 KB
+physical id	: 1
+siblings	: 6
+core id		: 1
+cpu cores	: 6
+apicid		: 13
+initial apicid	: 13
+fpu		: yes
+fpu_exception	: yes
+cpuid level	: 31
+wp		: yes
+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
+bugs		: cpu_meltdown spectre_v1 spectre_v2 spec_store_bypass l1tf mds swapgs
+bogomips	: 3795.60
+clflush size	: 64
+cache_alignment	: 64
+address sizes	: 40 bits physical, 48 bits virtual
+power management:
+
diff --git a/tests/virhostcpudata/linux-x86_64-with-die.expected b/tests/virhostcpudata/linux-x86_64-with-die.expected
new file mode 100644
index 0000000000..3c045f483a
--- /dev/null
+++ b/tests/virhostcpudata/linux-x86_64-with-die.expected
@@ -0,0 +1 @@
+CPUs: 12/12, MHz: 1897, Nodes: 1, Sockets: 1, Cores: 12, Threads: 1
diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
index 05c6f5acfb..7865b61578 100644
--- a/tests/virhostcputest.c
+++ b/tests/virhostcputest.c
@@ -248,6 +248,7 @@ mymain(void)
         /* subcores, invalid configuration */
         {"subcores3", VIR_ARCH_PPC64},
         {"with-frequency", VIR_ARCH_S390X},
+        {"with-die", VIR_ARCH_X86_64},
     };
 
     if (virInitialize() < 0)
-- 
2.23.0


