Remove un-supported CPU model on s390x

CPU_model: since z196 is deprecated start from 10, remove it Signed-off-by: Boqiao Fu <[email protected]>
autotest · Dec 17, 2024 · dc13dd8 · dc13dd8
1 parent d5bceb2
commit dc13dd8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/qemu/tests/cfg/s390x_cpu_model.cfg b/qemu/tests/cfg/s390x_cpu_model.cfg
@@ -10,6 +10,7 @@
             type = s390x_cpu_model_expansion
             variants:
                 - model_type_z196_z196_2_z114:
+                    no RHEL.10
                     cpu_models = "z196 z196.2 z114"
                     props = 'aefsi=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ipter=True bpb=True ppa15=True cmm=True'
                 - model_type_zEC12_zEC12_2_zBC12:
@@ -43,10 +44,14 @@
                 boot_cpu_models = 'z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
             RHEL.9:
                 boot_cpu_models = 'z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
+            RHEL.10:
+                boot_cpu_models = 'z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
         - cpu_baseline:
             type = s390x_cpu_model_baseline
             props1 = "msa1=True msa2=True msa3=False"
             props2 = "msa1=True msa2=False msa3=True"
             expected_props = "msa1"
             not_expected_props = "msa2 msa3"
-            cpu_models = "z196 z114 zEC12 zBC12 z13 z13.2 z14 gen15b gen16b"
+            cpu_models = "z14 gen15b gen16b"
+            ! RHEL.10:
+                cpu_models = "z196 z114 zEC12 zBC12 z13 z13.2 z14 gen15b gen16b"