summaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorCarsten Otte <cotte@de.ibm.com>2012-01-04 10:25:23 +0100
committerAvi Kivity <avi@redhat.com>2012-03-05 14:52:19 +0200
commit5b1c1493afe8d69909f9df3221bb2fffdf479f4a (patch)
treef64fa2be60cb44e4d9cb7cc9338b4dabba65348a /virt
parente168bf8de33e16a909df2401af1f7d419c5780de (diff)
downloadlinux-stable-5b1c1493afe8d69909f9df3221bb2fffdf479f4a.tar.gz
linux-stable-5b1c1493afe8d69909f9df3221bb2fffdf479f4a.tar.bz2
linux-stable-5b1c1493afe8d69909f9df3221bb2fffdf479f4a.zip
KVM: s390: ucontrol: export SIE control block to user
This patch exports the s390 SIE hardware control block to userspace via the mapping of the vcpu file descriptor. In order to do so, a new arch callback named kvm_arch_vcpu_fault is introduced for all architectures. It allows to map architecture specific pages. Signed-off-by: Carsten Otte <cotte@de.ibm.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 32e3b048a6cf..64be836f3348 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1657,7 +1657,7 @@ static int kvm_vcpu_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
page = virt_to_page(vcpu->kvm->coalesced_mmio_ring);
#endif
else
- return VM_FAULT_SIGBUS;
+ return kvm_arch_vcpu_fault(vcpu, vmf);
get_page(page);
vmf->page = page;
return 0;