From: Avi Kivity <avi@xxxxxxxxxx> Signed-off-by: Avi Kivity <avi@xxxxxxxxxx> diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 5bc820c..c3853d5 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2644,7 +2644,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, } *pfn = gfn_to_pfn_prot(vcpu->kvm, gfn, write, writable); - + return false; } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0301258..e0bd952 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1092,7 +1092,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v) tsc_timestamp = tsc; } } - + local_irq_restore(flags); if (!vcpu->time_page) @@ -5341,7 +5341,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) vcpu->run->exit_reason = KVM_EXIT_INTR; ++vcpu->stat.request_irq_exits; } - + kvm_check_async_pf_completion(vcpu); if (signal_pending(current)) { diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 83f5bf6..b1b6cbb 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1349,7 +1349,7 @@ int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, if (slots->generation != ghc->generation) kvm_gfn_to_hva_cache_init(kvm, ghc, ghc->gpa); - + if (kvm_is_error_hva(ghc->hva)) return -EFAULT; -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html