Re: [libvirt PATCH] tests: validate parsing of CPUs with dies > 1
On Mon, Mar 16, 2020 at 14:16:52 +0000, Daniel Berrange wrote:
Add sample data files for validating handling of a QEMU guest
started
with:
-smp 7,maxcpus=16,sockets=2,dies=2,cores=2,threads=2
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
...qemumonitorjson-cpuinfo-x86-dies-cpus.json | 95 ++++++++++
...umonitorjson-cpuinfo-x86-dies-hotplug.json | 171 ++++++++++++++++++
.../qemumonitorjson-cpuinfo-x86-dies.data | 108 +++++++++++
tests/qemumonitorjsontest.c | 1 +
4 files changed, 375 insertions(+)
create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-dies-cpus.json
create mode 100644
tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-dies-hotplug.json
create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-dies.data
[...]
+[vcpu libvirt-id='15']
+ online=no
+ hotpluggable=yes
+ type='host-x86_64-cpu'
+ topology: socket='1' core='1' thread='1' vcpus='1'
Missing change to testQemuMonitorCPUInfoFormat as instructed previously.
That way the die ID is not visible in the topology.
diff --git a/tests/qemumonitorjsontest.c
b/tests/qemumonitorjsontest.c
index 0a6760a794..ba60a97e7c 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -3235,6 +3235,7 @@ mymain(void)
DO_TEST_CPU_INFO("x86-full", 11);
DO_TEST_CPU_INFO("x86-node-full", 8);
DO_TEST_CPU_INFO_FAST("x86-full-fast", 11);
+ DO_TEST_CPU_INFO_FAST("x86-dies", 16);
If you address the above:
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>