I think Patches 1 and 2 are undisputed. Patch 1 needs to go into 2.10.1 as well. Patch 2 is for 2.11 Patch 3 is still under discussion if this is the right solution
v2->v3: - add the ais removal from the z14 cpu model - fix indent Christian Borntraeger (3): s390x/cpumodel: remove ais from z14 default model-> also for 2.10.1 s390x/ais: enable ais when migration is available s390x/ais: disable ais for compat machines hw/intc/s390_flic.c | 8 ++------ hw/intc/s390_flic_kvm.c | 18 +++++++++++++----- hw/s390x/css.c | 4 ++-- hw/s390x/s390-virtio-ccw.c | 20 +++++++++++++++++--- include/hw/s390x/s390-virtio-ccw.h | 3 +++ include/hw/s390x/s390_flic.h | 1 - target/s390x/gen-features.c | 1 - target/s390x/kvm.c | 10 ++-------- 8 files changed, 39 insertions(+), 26 deletions(-) -- 2.9.4
