Commit 3aaa8d44 authored Sep 22, 2017 by Peter Maydell

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>

parents a43415eb 3f2d07b3

target/s390x/kvm.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -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);