From 1c077f6a733f0b128d664352c242a926ea8aca7a Mon Sep 17 00:00:00 2001
From: Narayana Murty N <nnmlinux@linux.ibm.com>
Date: Tue, 13 May 2025 03:43:23 -0400
Subject: [PATCH] tests: qemuhotplugtest: Set the cpu version at source for
 PPC64 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Commit 140ff3c5141 ("tests: qemuhotplugtest: Fix arch-specific parts of
'ppc64' test XMLs") hardcoded the CPU model as POWER9 in the test result
XMLs. However, this value actually reflects the host CPU model detected
at build or test time, and can vary depending on the machine where the
tests run.

As newer POWER CPU models (e.g., POWER10, POWER11) become common, this
requires continuous updates to the test result files to match the CPU
version detected on the host. This adds unnecessary maintenance effort.

Fix this by updating the test source domain XMLs to specify POWER9 (or
any fixed version) as the CPU model. This ensures the test result files
stay stable and do not require updates every time a newer CPU is used on
the host system.

Signed-off-by: Narayana Murty N <nnmlinux@linux.ibm.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 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.47.2