Re: [PATCH] s390x/cpu_model: use official name for 8562

[Cornelia Huck]

On Fri, 12 Mar 2021 14:48:17 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 11.03.21 14:27, Cornelia Huck wrote:
> > The single-frame z15 is called "z15 T02".
> > 
> > Signed-off-by: Cornelia Huck <cohuck@redhat.com>  
> 
> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > ---
> >   target/s390x/cpu_models.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> > index dd474c5e9ad1..b59ed4135615 100644
> > --- a/target/s390x/cpu_models.c
> > +++ b/target/s390x/cpu_models.c
> > @@ -87,7 +87,7 @@ static S390CPUDef s390_cpu_defs[] = {
> >       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 z15 GA1"), 
> >  
> 
> you could also change that formn "z15" to "z15 T01"
> > -    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
> > +    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 
> > GA1"),
> >   };
> >   
> >   #define QEMU_MAX_CPU_TYPE 0x2964
> >   
> 

I now have:

Author: Cornelia Huck <cohuck@redhat.com>
Date:   Thu Mar 11 14:27:46 2021 +0100

    s390x/cpu_model: use official name for 8562
    
    The single-frame z15 is called "z15 T02" (and the multi-frame z15
    "z15 T01").
    
    Signed-off-by: Cornelia Huck <cohuck@redhat.com>
    Reviewed-by: David Hildenbrand <david@redhat.com>
    Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Message-Id: <20210311132746.1777754-1-cohuck@redhat.com>

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index dd474c5e9ad1..050dcf2d42d2 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -86,8 +86,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 z15 GA1"),
-    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
+    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM z15 T01 GA1"),
+    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM z15 T02 GA1"),
 };
 
 #define QEMU_MAX_CPU_TYPE 0x2964