|
|
ae23c9 |
From f53aa3f10b0c22093917fc076e3ddcb41398f12a Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
ae23c9 |
Date: Wed, 20 Jun 2018 10:58:31 +0000
|
|
|
ae23c9 |
Subject: s390x/cpumodels: add z14 Model ZR1
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Introduce the new z14 Model ZR1 cpu model. Mostly identical to z14, only
|
|
|
ae23c9 |
the cpu type differs (3906 vs. 3907)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
ae23c9 |
Message-Id: <20180613081819.147178-1-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 23ad956bff98d949057156ea3f68a9763c2dda0e)
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
target/s390x/cpu_models.c | 1 +
|
|
|
ae23c9 |
1 file changed, 1 insertion(+)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
|
|
|
ae23c9 |
index c4016e0..24e689c 100644
|
|
|
ae23c9 |
--- a/target/s390x/cpu_models.c
|
|
|
ae23c9 |
+++ b/target/s390x/cpu_models.c
|
|
|
ae23c9 |
@@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = {
|
|
|
ae23c9 |
CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"),
|
|
|
ae23c9 |
CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
|
|
|
ae23c9 |
CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
|
|
|
ae23c9 |
+ CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
|
|
|
ae23c9 |
};
|
|
|
ae23c9 |
|
|
|
ae23c9 |
#define QEMU_MAX_CPU_TYPE 0x2827
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|