[Xen-changelog] [qemu-xen master] s390x/ais: for 2.10 stable: disable ais facility

[patchbot@xxxxxxx]

commit a432f419abce2d63907978c3d48dfc9e3f740e49
Author:     Christian Borntraeger <borntraeger@xxxxxxxxxx>
AuthorDate: Thu Sep 21 16:08:34 2017 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Fri Sep 22 18:23:37 2017 -0500

    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@xxxxxxxxxx>
    Message-Id: <20170921140834.14233-2-borntraeger@xxxxxxxxxx>
    Signed-off-by: Cornelia Huck <cohuck@xxxxxxxxxx>
    (cherry picked from commit 3f2d07b3b01ea61126b382633ab4006320923048)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 target/s390x/kvm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index c4c5791..eb0dbb3 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -308,8 +308,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);
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog