yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
b38b0f
From a74dac6606968b164d38aaec5bd8bc1abef4100d Mon Sep 17 00:00:00 2001
b38b0f
From: Thomas Huth <thuth@redhat.com>
b38b0f
Date: Fri, 29 Mar 2019 11:13:36 +0000
b38b0f
Subject: [PATCH 2/7] s390x/cpumodel: add z14 GA2 model
b38b0f
b38b0f
RH-Author: Thomas Huth <thuth@redhat.com>
b38b0f
Message-id: <1553858017-376-3-git-send-email-thuth@redhat.com>
b38b0f
Patchwork-id: 85239
b38b0f
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 2/3] s390x/cpumodel: add z14 GA2 model
b38b0f
Bugzilla: 1664371
b38b0f
RH-Acked-by: David Hildenbrand <david@redhat.com>
b38b0f
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
b38b0f
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
b38b0f
b38b0f
From: Collin Walling <walling@linux.ibm.com>
b38b0f
b38b0f
Introduce the z14 GA2 cpu model for QEMU. There are no new features
b38b0f
introduced with this model, and will inherit the same feature set as
b38b0f
z14 GA1.
b38b0f
b38b0f
Signed-off-by: Collin Walling <walling@linux.ibm.com>
b38b0f
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
b38b0f
Reviewed-by: David Hildenbrand <david@redhat.com>
b38b0f
Message-Id: <20190212011657.18324-3-walling@linux.ibm.com>
b38b0f
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
b38b0f
(cherry picked from commit f2a7d1577115bda770d619ff5bc45db1f656edc3)
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 target/s390x/cpu_models.c   | 1 +
b38b0f
 target/s390x/gen-features.c | 7 +++++++
b38b0f
 2 files changed, 8 insertions(+)
b38b0f
b38b0f
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
b38b0f
index 43f16a7..5e9b716 100644
b38b0f
--- a/target/s390x/cpu_models.c
b38b0f
+++ b/target/s390x/cpu_models.c
b38b0f
@@ -79,6 +79,7 @@ static S390CPUDef s390_cpu_defs[] = {
b38b0f
     CPUDEF_INIT(0x2964, 13, 2, 47, 0x08000000U, "z13.2", "IBM z13 GA2"),
b38b0f
     CPUDEF_INIT(0x2965, 13, 2, 47, 0x08000000U, "z13s", "IBM z13s GA1"),
b38b0f
     CPUDEF_INIT(0x3906, 14, 1, 47, 0x08000000U, "z14", "IBM z14 GA1"),
b38b0f
+    CPUDEF_INIT(0x3906, 14, 2, 47, 0x08000000U, "z14.2", "IBM z14 GA2"),
b38b0f
     CPUDEF_INIT(0x3907, 14, 1, 47, 0x08000000U, "z14ZR1", "IBM z14 Model ZR1 GA1"),
b38b0f
 };
b38b0f
 
b38b0f
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
b38b0f
index 7302269..dee8375 100644
b38b0f
--- a/target/s390x/gen-features.c
b38b0f
+++ b/target/s390x/gen-features.c
b38b0f
@@ -353,6 +353,8 @@ static uint16_t base_GEN14_GA1[] = {
b38b0f
     S390_FEAT_ORDER_PRESERVING_COMPRESSION,
b38b0f
 };
b38b0f
 
b38b0f
+#define base_GEN14_GA2 EmptyFeat
b38b0f
+
b38b0f
 /* Full features (in order of release)
b38b0f
  * Automatically includes corresponding base features.
b38b0f
  * Full features are all features this hardware supports even if kvm/QEMU do not
b38b0f
@@ -480,6 +482,8 @@ static uint16_t full_GEN14_GA1[] = {
b38b0f
     S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
b38b0f
 };
b38b0f
 
b38b0f
+#define full_GEN14_GA2 EmptyFeat
b38b0f
+
b38b0f
 /* Default features (in order of release)
b38b0f
  * Automatically includes corresponding base features.
b38b0f
  * Default features are all features this version of QEMU supports for this
b38b0f
@@ -552,6 +556,8 @@ static uint16_t default_GEN14_GA1[] = {
b38b0f
     S390_FEAT_GROUP_MSA_EXT_8,
b38b0f
 };
b38b0f
 
b38b0f
+#define default_GEN14_GA2 EmptyFeat
b38b0f
+
b38b0f
 /* QEMU (CPU model) features */
b38b0f
 
b38b0f
 static uint16_t qemu_V2_11[] = {
b38b0f
@@ -660,6 +666,7 @@ static CpuFeatDefSpec CpuFeatDef[] = {
b38b0f
     CPU_FEAT_INITIALIZER(GEN13_GA1),
b38b0f
     CPU_FEAT_INITIALIZER(GEN13_GA2),
b38b0f
     CPU_FEAT_INITIALIZER(GEN14_GA1),
b38b0f
+    CPU_FEAT_INITIALIZER(GEN14_GA2),
b38b0f
 };
b38b0f
 
b38b0f
 #define FEAT_GROUP_INITIALIZER(_name)                  \
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f