From 7db16d6b16fa8f25168a7421e5c6d2f132ea06ab Mon Sep 17 00:00:00 2001

From: David Hildenbrand <david@redhat.com>

Date: Wed, 22 May 2019 08:04:02 +0100

Subject: [PATCH 10/12] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines

RH-Author: David Hildenbrand <david@redhat.com>

Message-id: <20190522080402.20173-11-david@redhat.com>

Patchwork-id: 88160

O-Subject: [RHEL8.1 qemu-kvm PATCH v2 10/10] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines

Bugzilla: 1660912

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

8561 and 8562 will be gen15 machines. There is no name yet, let us use

gen15a and gen15b as base name. Later on we can provide aliases with

the proper name.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

Message-Id: <20190429090250.7648-10-borntraeger@de.ibm.com>

Reviewed-by: David Hildenbrand <david@redhat.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit c657e84faee48d6ab36665da5a008b8f0649593d)

Signed-off-by: David Hildenbrand <david@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.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 737520b..91afc6b 100644

--- a/target/s390x/cpu_models.c

+++ b/target/s390x/cpu_models.c

@@ -41,10 +41,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"),

@@ -81,6 +80,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

-- 

1.8.3.1