From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Fri, 7 Apr 2017 12:23:13 +0000 (+0200)
Subject: KVM: s390: Fix sdnxo setting for nested guests
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=fe722d13e3638470a7eef5dad6c9ded7f6653773;p=openwrt%2Fstaging%2Fblogic.git

KVM: s390: Fix sdnxo setting for nested guests

If the guest does not use the host register management, but it uses
the sdnx area, we must fill in a proper sdnxo value (address of sdnx
and the sdnxc).

Reported-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---

diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index 2fafc2be777f..025b1f2e17a9 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -627,7 +627,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 			rc = set_validity_icpt(scb_s, 0x10b0U);
 		if (rc)
 			goto unpin;
-		scb_s->sdnxo = hpa;
+		scb_s->sdnxo = hpa | sdnxc;
 	}
 	return 0;
 unpin: