aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/kvm_host.h1
-rw-r--r--virt/kvm/kvm_main.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 840f44a096c..b2cf3109822 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -50,6 +50,7 @@
#define KVM_PFN_ERR_FAULT (-EFAULT)
#define KVM_PFN_ERR_HWPOISON (-EHWPOISON)
+#define KVM_PFN_ERR_BAD (-ENOENT)
/*
* vcpu->requests bit members
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7fce2d5787a..988b2339d84 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -934,11 +934,6 @@ int is_error_pfn(pfn_t pfn)
}
EXPORT_SYMBOL_GPL(is_error_pfn);
-static pfn_t get_bad_pfn(void)
-{
- return -ENOENT;
-}
-
int is_noslot_pfn(pfn_t pfn)
{
return pfn == -ENOENT;
@@ -1143,7 +1138,7 @@ static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async,
addr = gfn_to_hva(kvm, gfn);
if (kvm_is_error_hva(addr))
- return get_bad_pfn();
+ return KVM_PFN_ERR_BAD;
return hva_to_pfn(addr, atomic, async, write_fault, writable);
}