Remove un-supported CPU model on s390x #4235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fbq815
force-pushed
the
2646
branch
2 times, most recently
from
13b2dda to
dc13dd8
Compare
|
Test result on s390x: @PaulYuuu this commit would only effect s390x, could you please help me review and merge it? |
PaulYuuu
reviewed
Dec 20, 2024
| @@ -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: | |||
qemu/tests/cfg/s390x_cpu_model.cfg
Outdated
| @@ -10,6 +10,7 @@ | |||
| type = s390x_cpu_model_expansion | |||
| variants: | |||
| - model_type_z196_z196_2_z114: | |||
| no RHEL.10 | |||
There was a problem hiding this comment.
Only old versions would be better than no
qemu/tests/cfg/s390x_cpu_model.cfg
Outdated
| - 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_model: since z196 is deprecated start from 10, remove it Signed-off-by: Boqiao Fu <[email protected]>
|
Test result on s390x: @PaulYuuu updated, please help me review again |
PaulYuuu
approved these changes
Dec 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CPU_model: since z196 is deprecated start from 10, remove it
ID: 2646
Signed-off-by: Boqiao Fu [email protected]