[GIT,PULL,04/16] KVM: s390: only reset CMMA state if it was enabled before

Commit Message

Christian Borntraeger July 29, 2015, 9:05 a.m. UTC

From: Dominik Dingel <[e-mail]>

There is no point in resetting the CMMA state if it was never enabled.

Signed-off-by: Dominik Dingel <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Signed-off-by: Christian Borntraeger <[e-mail]>
---
 arch/s390/kvm/kvm-s390.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 641639b..3772947 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -344,6 +344,10 @@  static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_attr *att
 		mutex_unlock(&kvm->lock);
 		break;
 	case KVM_S390_VM_MEM_CLR_CMMA:
+		ret = -EINVAL;
+		if (!kvm->arch.use_cmma)
+			break;
+
 		mutex_lock(&kvm->lock);
 		idx = srcu_read_lock(&kvm->srcu);
 		s390_reset_cmma(kvm->arch.gmap->mm);