OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Fix an s390x migration breakage up for 2.10 stable. 

This will be fixed properly for 2.11.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJZxLuWAAoJEN7Pa5PG8C+vyYoQAKKwtRbhPXICcH7TmzGSsSa9
 /VEMCFg6JUsOtNEAaropjHpPygwlDwZRI6o+IR2O3eBX3nYsEjYdhRC3d1dwkuIG
 LEcQQiiH+tHBYUGIXQb0mwr8Px9QhH64+fF3UlMQ9TAjAK8YrQ7Gxvv/Xuahg14Y
 fdelPHQHl1e6gZzIcavDrFWKIMZ0A0aUNI+sUXSUEK7w9BWmRXKZZgFWX81MJBcL
 1yHvm9VvAvXfecQSrkpga/344jNT17rn+4tBwlJYx9DrWU3C3nWYFpAbcvcbn9qn
 vSeHCuFpRZI+IqJinYWF33yYVzcjEW/BYqh1WmA9x1lfWTJGOzC7n+MRAtPaTloG
 19kWczqdAYW8iwF5fCfaZ5UN28HtDGG/DIR6EgYXnjk9h7Ce0Vr0/tITV+fRvZD+
 3JMUhiWUmeSUiRSJuHaIhKbLCABY4IZvyyGTqFgOXjZaFlO53VynxB38Cl2fIUnn
 ZYA3/k75Maq8kGwpFaDrREU+kH1kMrZRHrz5QNZ+7jPpAsEFntGCDjvtRuY4Nj36
 6Cvgp+8bXaKkIPHuCxVbK0JG1bgUkDiDIEex6LXDFDQmAla9B329d6oh/zlHwUjr
 AOZ2vmM+sqhCwkdFie5fS8nVKKbrfBonaKI9rw5GGqsF0uUpcxiBQVdPlhrT6fqJ
 mv2XbA10WwlCqNQ5woCf
 =5B0R
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170922' into staging

Fix an s390x migration breakage up for 2.10 stable.
This will be fixed properly for 2.11.

# gpg: Signature made Fri 22 Sep 2017 08:28:22 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170922:
  s390x/ais: for 2.10 stable: disable ais facility

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-09-22 10:55:55 +01:00
parent a43415ebfd 3f2d07b3b0
commit 3aaa8d4499
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/s390x/kvm.c
View File

@ -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);