Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove un-supported CPU model on s390x #4235

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Remove un-supported CPU model on s390x #4235

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions qemu/tests/cfg/s390x_cpu_model.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
type = s390x_cpu_model_expansion
variants:
- model_type_z196_z196_2_z114:
only RHEL.7 RHEL.8 RHEL.9
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:
Expand Down Expand Up @@ -41,12 +42,14 @@
boot_cpu_models = 'z196,z196.2,z114;zEC12,zEC12.2,zBC12;z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
RHEL.8:
boot_cpu_models = 'z13,z13.2,z13s;z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
RHEL.9:
RHEL.9, RHEL.10:
boot_cpu_models = 'z14,z14.2,z14ZR1;gen15a,gen15b;gen16a,gen16b'
- cpu_baseline:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can combine them.

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.7, RHEL.8, RHEL.9:
cpu_models = "z196 z114 zEC12 zBC12 z13 z13.2 z14 gen15b gen16b"
Loading