On 29.04.19 11:02, Christian Borntraeger wrote:
> 8561 and 8562 will be gen15 machines. There is no name yet, lets us use
> gen15a and gen15tb as base name. Later on we can provide aliases with
nit: gen15b
> the proper name.
>
> Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
> ---
> target/s390x/cpu_models.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index d683635eb5..21ea819483 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -43,10 +43,9 @@
> }
>
> /*
> - * CPU definiton list in order of release. For now, base features of a
> - * following release are always a subset of base features of the previous
> - * release. Same is correct for the other feature sets.
> - * A BC release always follows the corresponding EC release.
> + * CPU definition list in order of release. Up to generation 14 base features
> + * of a following release have been a superset of the previous release. With
> + * generation 15 one base feature and one optional feature have been
> deprecated.
> */
> static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900
> GA1"),
> @@ -83,6 +82,8 @@ static S390CPUDef s390_cpu_defs[] = {
> CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
> CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
> CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1
> GA1"),
> + CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
> + CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
> };
>
> #define QEMU_MAX_CPU_TYPE 0x2827
>
Reviewed-by: David Hildenbrand <da...@redhat.com>
--
Thanks,
David / dhildenb
