Blame SOURCES/kvm-s390x-cpumodel-wire-up-8561-and-8562-as-gen15-machin.patch

Pablo Greco e6a3ae
From 7db16d6b16fa8f25168a7421e5c6d2f132ea06ab Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Date: Wed, 22 May 2019 08:04:02 +0100
Pablo Greco e6a3ae
Subject: [PATCH 10/12] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Message-id: <20190522080402.20173-11-david@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 88160
Pablo Greco e6a3ae
O-Subject: [RHEL8.1 qemu-kvm PATCH v2 10/10] s390x/cpumodel: wire up 8561 and 8562 as gen15 machines
Pablo Greco e6a3ae
Bugzilla: 1660912
Pablo Greco e6a3ae
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
8561 and 8562 will be gen15 machines. There is no name yet, let us use
Pablo Greco e6a3ae
gen15a and gen15b as base name. Later on we can provide aliases with
Pablo Greco e6a3ae
the proper name.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Pablo Greco e6a3ae
Message-Id: <20190429090250.7648-10-borntraeger@de.ibm.com>
Pablo Greco e6a3ae
Reviewed-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
(cherry picked from commit c657e84faee48d6ab36665da5a008b8f0649593d)
Pablo Greco e6a3ae
Signed-off-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 target/s390x/cpu_models.c | 9 +++++----
Pablo Greco e6a3ae
 1 file changed, 5 insertions(+), 4 deletions(-)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
Pablo Greco e6a3ae
index 737520b..91afc6b 100644
Pablo Greco e6a3ae
--- a/target/s390x/cpu_models.c
Pablo Greco e6a3ae
+++ b/target/s390x/cpu_models.c
Pablo Greco e6a3ae
@@ -41,10 +41,9 @@
Pablo Greco e6a3ae
     }
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
 /*
Pablo Greco e6a3ae
- * CPU definiton list in order of release. For now, base features of a
Pablo Greco e6a3ae
- * following release are always a subset of base features of the previous
Pablo Greco e6a3ae
- * release. Same is correct for the other feature sets.
Pablo Greco e6a3ae
- * A BC release always follows the corresponding EC release.
Pablo Greco e6a3ae
+ * CPU definition list in order of release. Up to generation 14 base features
Pablo Greco e6a3ae
+ * of a following release have been a superset of the previous release. With
Pablo Greco e6a3ae
+ * generation 15 one base feature and one optional feature have been deprecated.
Pablo Greco e6a3ae
  */
Pablo Greco e6a3ae
 static S390CPUDef s390_cpu_defs[] = {
Pablo Greco e6a3ae
     CPUDEF_INIT(0x2064, 7, 1, 38, 0x00000000U, "z900", "IBM zSeries 900 GA1"),
Pablo Greco e6a3ae
@@ -81,6 +80,8 @@ static S390CPUDef s390_cpu_defs[] = {
Pablo Greco e6a3ae
     CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
Pablo Greco e6a3ae
     CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
Pablo Greco e6a3ae
     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
Pablo Greco e6a3ae
+    CPUDEF_INIT(0x8561, 15, 1, 47, 0x08000000U, "gen15a", "IBM 8561 GA1"),
Pablo Greco e6a3ae
+    CPUDEF_INIT(0x8562, 15, 1, 47, 0x08000000U, "gen15b", "IBM 8562 GA1"),
Pablo Greco e6a3ae
 };
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
 #define QEMU_MAX_CPU_TYPE 0x2827
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae