[PATCH v3 2/5] tests: qemuhotplugtest: Set the cpu version at source for PPC64 tests

The commit 140ff3c5141 ("tests: qemuhotplugtest: Fix arch-specific parts of 'ppc64' test XMLs") fixated on the POWER9 in results xml which actually would be the host-cpu at the moment on the source tree. With updates to higher cpu versions this has to continuously be updated. Instead, update the test source domains to use POWER9(or any) as fixed version, so that we dont need to keep updating this test results file with every cpu version bump-up. Signed-off-by: Narayana Murty N <nnmlinux(a)linux.ibm.com&gt; --- tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml | 3 ++- tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml | 3 ++- tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml | 3 ++- tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml index f7c754ccf7..abef39b130 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-domain.xml @@ -8,7 +8,8 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='network'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> <topology sockets="1" cores="4" threads="8"/> </cpu> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml index f7c754ccf7..abef39b130 100644 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-domain.xml @@ -8,7 +8,8 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='network'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> <topology sockets="1" cores="4" threads="8"/> </cpu> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml index bf7df9a259..d0868db672 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml +++ b/tests/qemuxmlconfdata/memory-hotplug-nvdimm-ppc64.xml @@ -9,7 +9,8 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> - <cpu> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> <topology sockets='2' dies='1' cores='1' threads='1'/> <numa> <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> diff --git a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml index 0623fde6ee..436a8d1895 100644 --- a/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml +++ b/tests/qemuxmlconfdata/memory-hotplug-ppc64-nonuma.xml @@ -9,6 +9,9 @@ <type arch='ppc64' machine='pseries'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> -- 2.48.1