yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

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

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