summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorChristian Borntraeger2017-04-07 14:23:13 +0200
committerChristian Borntraeger2017-04-12 13:47:31 +0200
commitfe722d13e3638470a7eef5dad6c9ded7f6653773 (patch)
tree5e5999f94c1e0aa3c8da49451cb1a16ce0c29f7f /arch/s390
parentMerge tag 'kvm-s390-next-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadkernel-qcow2-linux-fe722d13e3638470a7eef5dad6c9ded7f6653773.tar.gz
kernel-qcow2-linux-fe722d13e3638470a7eef5dad6c9ded7f6653773.tar.xz
kernel-qcow2-linux-fe722d13e3638470a7eef5dad6c9ded7f6653773.zip
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>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/vsie.c2
1 files changed, 1 insertions, 1 deletions
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: