diff options
| author | David Hildenbrand <david@redhat.com> | 2022-04-28 11:46:58 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-05-04 08:47:19 +0200 |
| commit | d98ed7d96e2951b5e5c92b0f1de9aa2e58889019 (patch) | |
| tree | 7f6c206a7036a88d8eff71c5520292ae01e39e08 /target/s390x/gen-features.c | |
| parent | 4756b106b372e525365c62b41df38052571c0a71 (diff) | |
| download | qemu-d98ed7d96e2951b5e5c92b0f1de9aa2e58889019.zip qemu-d98ed7d96e2951b5e5c92b0f1de9aa2e58889019.tar.gz qemu-d98ed7d96e2951b5e5c92b0f1de9aa2e58889019.tar.bz2 | |
s390x/cpu_models: make "max" match the unmodified "qemu" CPU model under TCG
Before we were able to bump up the qemu CPU model to a z13, we included
some experimental features during development in the "max" model only.
Nowadays, the "max" model corresponds exactly to the "qemu" CPU model
of the latest QEMU machine under TCG.
Let's remove all the special casing, effectively making both models
match completely from now on, and clean up.
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220428094708.84835-4-david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'target/s390x/gen-features.c')
| -rw-r--r-- | target/s390x/gen-features.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 7b4430f..ec7d8ce 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -738,11 +738,13 @@ static uint16_t qemu_V6_2[] = { S390_FEAT_VECTOR_ENH, }; -static uint16_t qemu_LATEST[] = { - S390_FEAT_MISC_INSTRUCTION_EXT3, -}; -/* add all new definitions before this point */ +/* + * Features for the "qemu" CPU model of the latest QEMU machine and the "max" + * CPU model under TCG. Don't include features that are not part of the full + * feature set of the current "max" CPU model generation. + */ static uint16_t qemu_MAX[] = { + S390_FEAT_MISC_INSTRUCTION_EXT3, }; /****** END FEATURE DEFS ******/ @@ -864,7 +866,6 @@ static FeatGroupDefSpec QemuFeatDef[] = { QEMU_FEAT_INITIALIZER(V4_1), QEMU_FEAT_INITIALIZER(V6_0), QEMU_FEAT_INITIALIZER(V6_2), - QEMU_FEAT_INITIALIZER(LATEST), QEMU_FEAT_INITIALIZER(MAX), }; |