aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2017-09-21 16:08:34 +0200
committerCornelia Huck <cohuck@redhat.com>2017-09-22 09:25:21 +0200
commit3f2d07b3b01ea61126b382633ab4006320923048 (patch)
tree87ed3417360b21a4b34b77b5fb6fdc513e98deb6
parent0a8066f0c068f1e318a1aacd7864fc00e455a37b (diff)
downloadqemu-3f2d07b3b01ea61126b382633ab4006320923048.zip
qemu-3f2d07b3b01ea61126b382633ab4006320923048.tar.gz
qemu-3f2d07b3b01ea61126b382633ab4006320923048.tar.bz2
s390x/ais: for 2.10 stable: disable ais facility
The migration interface for ais was introduced with kernel 4.13 but the capability itself had been active since 4.12. As migration support is considered necessary lets disable ais in the 2.10 stable version. A proper fix and re-enablement will be done for qemu 2.11. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Message-Id: <20170921140834.14233-2-borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-rw-r--r--target/s390x/kvm.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 720cb1d..ebb75ca 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -311,8 +311,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
}
}
- /* Try to enable AIS facility */
- kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);
+ /*
+ * The migration interface for ais was introduced with kernel 4.13
+ * but the capability itself had been active since 4.12. As migration
+ * support is considered necessary let's disable ais in the 2.10
+ * machine.
+ */
+ /* kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); */
qemu_mutex_init(&qemu_sigp_mutex);