Merge tag 'kvm-ppc-fixes-4.20-1' of https://git.kernel.org/pub/scm/li…

…nux/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.
mariux64 · Nov 25, 2018 · caf54f5 · caf54f5
2 parents 9ff0119 + 6c08ec1
commit caf54f5
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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;