Merge pull request #4378 from fbq815/KVMAUTOMA-3939

s390x_cpu_model_expansion: Add gen17 test coverage on s390x

Author: PaulYuuu

qemu/tests/cfg/s390x_cpu_model.cfg

@@ -33,13 +33,17 @@
                     required_qemu = (7.1.0,)
                     cpu_models = "gen16a gen16b"
                     props = 'nnpa=True aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True sthyi=True edat=True ri=True deflate=True edat2=True etoken=True vx=True ipter=True pai=True paie=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True rdp=True sea_esop2=True beareh=True te=True cmm=True vxpdeh2=True'
+                - model_type_gen17a_gen17b:
+                    required_qemu = (9.1.0,)
+                    cpu_models = "gen17a gen17b"
+                    props = 'nnpa=True aen=True vxpdeh=True aefsi=True mepoch=True msa9=True msa8=True msa7=True msa6=True msa5=True msa4=True msa3=True msa2=True msa1=True msa13_pckmo=True msa11_pckmo=True msa10_pckmo=True sthyi=True edat=True ri=True deflate=True msa13=True msa11=True msa10=True edat2=True vxpdeh3=True etoken=True vx=True ipter=True pai=True paie=True mepochptff=True vxeh=True vxpd=True esop=True msa9_pckmo=True vxeh3=True vxeh2=True iep=True cte=True gs=True ppa15=True zpci=True rdp=True sea_esop2=True beareh=True te=True cmm=True vxpdeh2=True'
         - boot_cpu_models:
             type = s390x_cpu_model_boot
             auto_cpu_model = yes
             cpu_model_check_cmd = "query-cpu-model-expansion"
             cpu_model_check_args = '{"type": "static", "model": {"name": "host"}}'
             RHEL.7:
-                boot_cpu_models = 'z196,z196.2,z114;zEC12,zEC12.2,zBC12;z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
+                boot_cpu_models = 'z196,z196.2,z114;zEC12,zEC12.2,zBC12;z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b'
             RHEL.8:
                 boot_cpu_models = 'z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
             RHEL.9, RHEL.10:
@@ -50,6 +54,6 @@
             props2 = "msa1=True msa2=False msa3=True"
             expected_props = "msa1"
             not_expected_props = "msa2 msa3"
-            cpu_models = "z14 gen15b gen16b"
+            cpu_models = "z14 gen15b gen16b gen17b"
             RHEL.7, RHEL.8, RHEL.9:
                 cpu_models = "z196 z114 zEC12 zBC12 z13 z13.2 z14 gen15b gen16b"