yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-redhat-s390x-cpumodel-enable-mepoch-by-default-for-z.patch

b38b0f
From c2c11da318c64a43bb0ed7d07f329d2f1816eb3f Mon Sep 17 00:00:00 2001
b38b0f
From: Thomas Huth <thuth@redhat.com>
b38b0f
Date: Fri, 29 Mar 2019 11:13:37 +0000
b38b0f
Subject: [PATCH 3/7] redhat: s390x/cpumodel: enable mepoch by default for z14
b38b0f
 GA2
b38b0f
b38b0f
RH-Author: Thomas Huth <thuth@redhat.com>
b38b0f
Message-id: <1553858017-376-4-git-send-email-thuth@redhat.com>
b38b0f
Patchwork-id: 85240
b38b0f
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 3/3] redhat: s390x/cpumodel: enable mepoch by default for z14 GA2
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
Upstream-status: n/a (downstream only)
b38b0f
b38b0f
Enable the mepoch feature for the new z14 GA2 CPU model. In upstream
b38b0f
QEMU, this feature has already been enabled by default for the GA1
b38b0f
CPU model in new machine types, too:
b38b0f
b38b0f
    84176c7906ffaf59457bd7dff25a3ea32e00c3d8
b38b0f
    "s390x/cpumodel: default enable mepoch for z14 and later"
b38b0f
b38b0f
But since we do not have new machine types in RHEL8 qemu-kvm yet,
b38b0f
we can not play the trick with the machine type here and thus can
b38b0f
only enable mepoch for the new z14 GA2 CPU. Users of the z14 GA1
b38b0f
CPU will have to enable this feature manually.
b38b0f
b38b0f
Signed-off-by: Thomas Huth <thuth@redhat.com>
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 target/s390x/gen-features.c | 10 +++++++++-
b38b0f
 1 file changed, 9 insertions(+), 1 deletion(-)
b38b0f
b38b0f
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c
b38b0f
index dee8375..739d5f1 100644
b38b0f
--- a/target/s390x/gen-features.c
b38b0f
+++ b/target/s390x/gen-features.c
b38b0f
@@ -556,7 +556,15 @@ static uint16_t default_GEN14_GA1[] = {
b38b0f
     S390_FEAT_GROUP_MSA_EXT_8,
b38b0f
 };
b38b0f
 
b38b0f
-#define default_GEN14_GA2 EmptyFeat
b38b0f
+/*
b38b0f
+ * Red Hat only: We enable the MULTIPLE_EPOCH features only for z14 GA2 and
b38b0f
+ * not for GA1 already, since we do not have a new s390-ccw-virtio-rhel8.y.0
b38b0f
+ * machine type for applying upstream commit 84176c7906ffaf59457bd7 correctly.
b38b0f
+ */
b38b0f
+static uint16_t default_GEN14_GA2[] = {
b38b0f
+    S390_FEAT_MULTIPLE_EPOCH,
b38b0f
+    S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
b38b0f
+};
b38b0f
 
b38b0f
 /* QEMU (CPU model) features */
b38b0f
 
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f