Quoting Cornelia Huck (2017-09-21 10:21:42) > On Thu, 21 Sep 2017 17:14:46 +0200 > Christian Borntraeger <borntrae...@de.ibm.com> wrote: > > > 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. > > Also now with qemu-devel on cc: > > So, should I apply to s390-next? Or can this be applied just to stable?
Ideally we would get it in master or at least a branch that'll eventually get pulled so we can reference the upstream commit ID. It's not set in stone, but usually only patches specifically ported to stable are applied directly. > > > > > Signed-off-by: Christian Borntraeger <borntrae...@de.ibm.com> > > Reviewed-by: Cornelia Huck <coh...@redhat.com> > > --- > > 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); > > >
