aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>2012-08-03 03:39:19 -0400
committerAvi Kivity <avi@redhat.com>2012-08-06 09:04:52 -0400
commit950e95097b1c6573ef5e21061ccb56964278c45b (patch)
treed5434cf13c46f2caa6a0cf5d9b662efeb9c93c41 /virt
parente6c1502b3f933ace20c711ce34ab696f5a67086d (diff)
KVM: introduce KVM_PFN_ERR_BAD
Then, remove get_bad_pfn Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 7fce2d5787ae..988b2339d846 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -934,11 +934,6 @@ int is_error_pfn(pfn_t pfn)
934} 934}
935EXPORT_SYMBOL_GPL(is_error_pfn); 935EXPORT_SYMBOL_GPL(is_error_pfn);
936 936
937static pfn_t get_bad_pfn(void)
938{
939 return -ENOENT;
940}
941
942int is_noslot_pfn(pfn_t pfn) 937int is_noslot_pfn(pfn_t pfn)
943{ 938{
944 return pfn == -ENOENT; 939 return pfn == -ENOENT;
@@ -1143,7 +1138,7 @@ static pfn_t __gfn_to_pfn(struct kvm *kvm, gfn_t gfn, bool atomic, bool *async,
1143 1138
1144 addr = gfn_to_hva(kvm, gfn); 1139 addr = gfn_to_hva(kvm, gfn);
1145 if (kvm_is_error_hva(addr)) 1140 if (kvm_is_error_hva(addr))
1146 return get_bad_pfn(); 1141 return KVM_PFN_ERR_BAD;
1147 1142
1148 return hva_to_pfn(addr, atomic, async, write_fault, writable); 1143 return hva_to_pfn(addr, atomic, async, write_fault, writable);
1149} 1144}