diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2018-11-25 18:56:32 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-11-25 18:56:32 +0100 |
| commit | caf54f59e57e1652e2460d3a45dce233d44d5884 (patch) | |
| tree | 074648942cb7877bb7e3b0295cca0f87f440db1a /arch/powerpc | |
| parent | Linux 4.20-rc3 (diff) | |
| parent | KVM: PPC: Book3S HV: Fix handling for interrupted H_ENTER_NESTED (diff) | |
| download | linux-dev-caf54f59e57e1652e2460d3a45dce233d44d5884.tar.xz linux-dev-caf54f59e57e1652e2460d3a45dce233d44d5884.zip | |
Merge tag 'kvm-ppc-fixes-4.20-1' of https://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
PPC KVM fixes for 4.20
This has a single 1-line patch which fixes a bug in the recently-merged
nested HV KVM support.
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index d65b961661fb..a56f8413758a 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -983,6 +983,7 @@ int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu) ret = kvmhv_enter_nested_guest(vcpu); if (ret == H_INTERRUPT) { kvmppc_set_gpr(vcpu, 3, 0); + vcpu->arch.hcall_needed = 0; return -EINTR; } break; |