summary refs log tree commit diff stats
path: root/hw
diff options
context:
space:
mode:
authorCollin Walling <walling@linux.ibm.com>2019-02-11 20:16:56 -0500
committerCornelia Huck <cohuck@redhat.com>2019-02-18 11:25:43 +0100
commit84176c7906ffaf59457bd7dff25a3ea32e00c3d8 (patch)
tree6ab9527c59029ddf48ba4625e647c5356d6853bf /hw
parentddf5d18af3ce3029d5b93222af5a9e8160d4c34b (diff)
downloadfocaccia-qemu-84176c7906ffaf59457bd7dff25a3ea32e00c3d8.tar.gz
focaccia-qemu-84176c7906ffaf59457bd7dff25a3ea32e00c3d8.zip
s390x/cpumodel: default enable mepoch for z14 and later
Latest systems and host kernels support mepoch, which is a
feature that was meant to be supported for z14 GA1 from the
get-go. Let's copy it to the z14 GA1 default CPU model.

Machines s390-ccw-virtio-3.1 and older will retain the old CPU
models and will not provide this bit nor the extended PTFF
functions in the default model.

Signed-off-by: Collin Walling <walling@linux.ibm.com>
Message-Id: <20190212011657.18324-2-walling@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/s390x/s390-virtio-ccw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1a3414b642..d11069b860 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -659,7 +659,8 @@ static void ccw_machine_3_1_instance_options(MachineState *machine)
 {
     static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
     ccw_machine_4_0_instance_options(machine);
-
+    s390_cpudef_featoff_greater(14, 1, S390_FEAT_MULTIPLE_EPOCH);
+    s390_cpudef_group_featoff_greater(14, 1, S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF);
     s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
 }