On 07.09.21 11:11, Christian Borntraeger wrote:
Add the new gen16 features to the default model and fence them for
machine version 6.1 and earlier.
Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com>
---
hw/s390x/s390-virtio-ccw.c | 5 +++++
target/s390x/gen-features.c | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4d25278cf20e..72573ec66e84 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -803,6 +803,11 @@ DEFINE_CCW_MACHINE(6_2, "6.2", true);
static void ccw_machine_6_1_instance_options(MachineState *machine)
{
ccw_machine_6_2_instance_options(machine);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_NNPA);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_VECTOR_PACKED_DECIMAL_ENH2);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_BEAR_ENH);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_RDP);
+ s390_cpudef_featoff_greater(12, 1, S390_FEAT_PAI);
It does not hurt, but the 12 should be 16 of course.
Will fix.
