Fix issues in code

Signed-off-by: nanliu <[email protected]>
autotest · Nov 21, 2024 · 7943f8e · 7943f8e
1 parent bcd89cd
commit 7943f8e
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/qemu/tests/cfg/x86_cpu_model.cfg b/qemu/tests/cfg/x86_cpu_model.cfg
@@ -124,15 +124,17 @@
             model_pattern = "AMD EPYC-v4 Processor%s"
         - Opteron_G5:
             only HostCpuVendor.amd
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de f16c avx xsave aes popcnt sse4_2 sse4_1 cx16 fma ssse3 pclmulqdq lm pdpe1gb nx syscall tbm fma4 xop 3dnowprefetch misalignsse sse4a abm lahf_lm fpu"
             model_pattern = "AMD Opteron 63xx class CPU%s"
         - Opteron_G4:
             only HostCpuVendor.amd
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de  avx xsave aes popcnt sse4_2 sse4_1 cx16 ssse3 pclmulqdq lm pdpe1gb nx syscall fma4 xop 3dnowprefetch misalignsse sse4a abm lahf_lm fpu"
             model_pattern = "AMD Opteron 62xx class CPU%s"
         - Opteron_G3:
             only HostCpuVendor.amd
-            no RHEL.9
+            only RHEL.6, RHEL.7, RHEL.8
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de  popcnt cx16 lm nx syscall misalignsse sse4a abm lahf_lm fpu"
             model_pattern = "AMD Opteron 23xx \(Gen 3 Class Opteron%s\)"
         - SapphireRapids:
@@ -152,20 +154,23 @@
             model_pattern = "Intel Xeon Processor \(SapphireRapids\)"
         - Snowridge:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
             # support 'movdiri' since RHEL.8.2
             RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v1:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
             # support 'movdiri' since RHEL.8.2
             RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v2:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
             no_flags = "mpx"
@@ -174,6 +179,7 @@
                 flags = ""
         - Snowridge-v3:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
             no_flags = "mpx"
@@ -182,6 +188,7 @@
                 flags = ""
         - Snowridge-v4:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             required_qemu = [6.2.0,)
             # no split lock detect, no core-capability
             flags = "gfni movdiri movdir64b cldemote umip"
@@ -278,15 +285,15 @@
                 flags = ""
         - Icelake-Client:
             only HostCpuVendor.intel
-            no RHEL.9
+            only RHEL.6, RHEL.7, RHEL.8
             required_qemu = (, 5.2.0)
             flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
             model_pattern = "Intel Core Processor \(Icelake%s\)"
             RHEL.6, RHEL.7:
                 flags = ""
         - Icelake-Client-noTSX:
             only HostCpuVendor.intel
-            no RHEL.9
+            only RHEL.6, RHEL.7, RHEL.8
             required_qemu = (, 5.2.0)
             flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
             model_pattern = "Intel Core Processor \(Icelake%s\)"
@@ -469,26 +476,32 @@
             no_flags = "hle rtm"
         - IvyBridge:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
         - IvyBridge-v1:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
         - IvyBridge-v2:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             # support "spec-ctrl"
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge, IBRS%s\)"
         - SandyBridge:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
         - SandyBridge-v1:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
         - SandyBridge-v2:
             only HostCpuVendor.intel
+            only RHEL.6, RHEL.7, RHEL.8, RHEL.9
             flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge, IBRS update%s\)"