diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-29 15:44:05 +0100 |
| commit | 7227fc0666606b0df2c0d2966a7f4859b01bdf74 (patch) | |
| tree | 2effa7ffe302b1ef917b29973cb5b3bc9343ce8b /arch/powerpc/kvm/book3s_rtas.c | |
| parent | 6acdb1603a7db4c1b5d91863a13d2c3f1b9188b0 (diff) | |
| parent | 72cde5a88d37ba88ad1d47aecf957a9e528636d7 (diff) | |
Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into kvm-next
Diffstat (limited to 'arch/powerpc/kvm/book3s_rtas.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_rtas.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_rtas.c b/arch/powerpc/kvm/book3s_rtas.c index cf95cdef73c..7a053157483 100644 --- a/arch/powerpc/kvm/book3s_rtas.c +++ b/arch/powerpc/kvm/book3s_rtas.c @@ -213,8 +213,11 @@ int kvmppc_rtas_hcall(struct kvm_vcpu *vcpu) gpa_t args_phys; int rc; - /* r4 contains the guest physical address of the RTAS args */ - args_phys = kvmppc_get_gpr(vcpu, 4); + /* + * r4 contains the guest physical address of the RTAS args + * Mask off the top 4 bits since this is a guest real address + */ + args_phys = kvmppc_get_gpr(vcpu, 4) & KVM_PAM; rc = kvm_read_guest(vcpu->kvm, args_phys, &args, sizeof(args)); if (rc) |