[Qemu-devel] [PULL 0/1] s390x bugfix (needed for stable)

[Qemu-devel] [PULL 0/1] s390x bugfix (needed for stable)

[Cornelia Huck]

The following changes since commit 0a8066f0c068f1e318a1aacd7864fc00e455a37b:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170921' into staging (2017-09-21 17:42:27 +0100)

are available in the git repository at:

  git://github.com/cohuck/qemu tags/s390x-20170922

for you to fetch changes up to 3f2d07b3b01ea61126b382633ab4006320923048:

  s390x/ais: for 2.10 stable: disable ais facility (2017-09-22 09:25:21 +0200)

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

----------------------------------------------------------------

Christian Borntraeger (1):
  s390x/ais: for 2.10 stable: disable ais facility

 target/s390x/kvm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

-- 
2.13.5

[Qemu-devel] [PULL 1/1] s390x/ais: for 2.10 stable: disable ais facility

[Cornelia Huck]

From: Christian Borntraeger <borntraeger@de.ibm.com>

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>
---
 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 720cb1d833..ebb75cafaa 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);
 
-- 
2.13.5

Re: [Qemu-devel] [PULL 0/1] s390x bugfix (needed for stable)

[Peter Maydell]

On 22 September 2017 at 08:34, Cornelia Huck <cohuck@redhat.com> wrote:
> The following changes since commit 0a8066f0c068f1e318a1aacd7864fc00e455a37b:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170921' into staging (2017-09-21 17:42:27 +0100)
>
> are available in the git repository at:
>
>   git://github.com/cohuck/qemu tags/s390x-20170922
>
> for you to fetch changes up to 3f2d07b3b01ea61126b382633ab4006320923048:
>
>   s390x/ais: for 2.10 stable: disable ais facility (2017-09-22 09:25:21 +0200)
>
> ----------------------------------------------------------------
> Fix an s390x migration breakage up for 2.10 stable.
> This will be fixed properly for 2.11.
>
> ----------------------------------------------------------------
>
> Christian Borntraeger (1):
>   s390x/ais: for 2.10 stable: disable ais facility
>
>  target/s390x/kvm.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>

Applied, thanks.

-- PMM