|
 |
9bac43 |
From 49a0dc9e670b7f67713a7f9115028a4a29fbd03b Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
Date: Thu, 5 Oct 2017 12:04:05 +0200
|
|
|
9bac43 |
Subject: [PATCH 11/34] s390x/ais: for 2.10 stable: disable ais facility
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
Message-id: <20171005120406.16642-2-cohuck@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 76818
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH 1/2] s390x/ais: for 2.10 stable: disable ais facility
|
|
|
9bac43 |
Bugzilla: 1494548
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
The migration interface for ais was introduced with kernel 4.13
|
|
|
9bac43 |
but the capability itself had been active since 4.12. As migration
|
|
|
9bac43 |
support is considered necessary lets disable ais in the 2.10
|
|
|
9bac43 |
stable version. A proper fix and re-enablement will be done
|
|
|
9bac43 |
for qemu 2.11.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
9bac43 |
Message-Id: <20170921140834.14233-2-borntraeger@de.ibm.com>
|
|
|
9bac43 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
(cherry picked from commit 3f2d07b3b01ea61126b382633ab4006320923048)
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
target/s390x/kvm.c | 9 +++++++--
|
|
|
9bac43 |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
|
|
|
9bac43 |
index c4c5791..eb0dbb3 100644
|
|
|
9bac43 |
--- a/target/s390x/kvm.c
|
|
|
9bac43 |
+++ b/target/s390x/kvm.c
|
|
|
9bac43 |
@@ -308,8 +308,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
|
|
|
9bac43 |
}
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
- /* Try to enable AIS facility */
|
|
|
9bac43 |
- kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);
|
|
|
9bac43 |
+ /*
|
|
|
9bac43 |
+ * The migration interface for ais was introduced with kernel 4.13
|
|
|
9bac43 |
+ * but the capability itself had been active since 4.12. As migration
|
|
|
9bac43 |
+ * support is considered necessary let's disable ais in the 2.10
|
|
|
9bac43 |
+ * machine.
|
|
|
9bac43 |
+ */
|
|
|
9bac43 |
+ /* kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); */
|
|
|
9bac43 |
|
|
|
9bac43 |
qemu_mutex_init(&qemu_sigp_mutex);
|
|
|
9bac43 |
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|