diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kvm/book3s_pr_papr.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_pr_papr.c b/arch/powerpc/kvm/book3s_pr_papr.c index 6d0143fbeb63..ce3c893d509b 100644 --- a/arch/powerpc/kvm/book3s_pr_papr.c +++ b/arch/powerpc/kvm/book3s_pr_papr.c | |||
@@ -267,6 +267,8 @@ static int kvmppc_h_pr_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd) | |||
267 | 267 | ||
268 | int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) | 268 | int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) |
269 | { | 269 | { |
270 | int rc, idx; | ||
271 | |||
270 | if (cmd <= MAX_HCALL_OPCODE && | 272 | if (cmd <= MAX_HCALL_OPCODE && |
271 | !test_bit(cmd/4, vcpu->kvm->arch.enabled_hcalls)) | 273 | !test_bit(cmd/4, vcpu->kvm->arch.enabled_hcalls)) |
272 | return EMULATE_FAIL; | 274 | return EMULATE_FAIL; |
@@ -299,8 +301,11 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) | |||
299 | break; | 301 | break; |
300 | case H_RTAS: | 302 | case H_RTAS: |
301 | if (list_empty(&vcpu->kvm->arch.rtas_tokens)) | 303 | if (list_empty(&vcpu->kvm->arch.rtas_tokens)) |
302 | return RESUME_HOST; | 304 | break; |
303 | if (kvmppc_rtas_hcall(vcpu)) | 305 | idx = srcu_read_lock(&vcpu->kvm->srcu); |
306 | rc = kvmppc_rtas_hcall(vcpu); | ||
307 | srcu_read_unlock(&vcpu->kvm->srcu, idx); | ||
308 | if (rc) | ||
304 | break; | 309 | break; |
305 | kvmppc_set_gpr(vcpu, 3, 0); | 310 | kvmppc_set_gpr(vcpu, 3, 0); |
306 | return EMULATE_DONE; | 311 | return EMULATE_DONE; |