diff options
author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2012-08-03 03:41:22 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2012-08-06 09:04:55 -0400 |
commit | 6cede2e6794be6b0649f62d3681e0c4aff5a9270 (patch) | |
tree | b05fdcfd0db7974c7ed7f036d07520ac4c12202f /virt/kvm/kvm_main.c | |
parent | 9a592a953880fd6981955e69c1476ce541d9bd16 (diff) |
KVM: introduce KVM_ERR_PTR_BAD_PAGE
It is used to eliminate the overload of function call and cleanup
the code
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r-- | virt/kvm/kvm_main.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index eb73e5f13678..93d3c6e063c8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -922,17 +922,6 @@ void kvm_disable_largepages(void) | |||
922 | } | 922 | } |
923 | EXPORT_SYMBOL_GPL(kvm_disable_largepages); | 923 | EXPORT_SYMBOL_GPL(kvm_disable_largepages); |
924 | 924 | ||
925 | int is_error_page(struct page *page) | ||
926 | { | ||
927 | return IS_ERR(page); | ||
928 | } | ||
929 | EXPORT_SYMBOL_GPL(is_error_page); | ||
930 | |||
931 | struct page *get_bad_page(void) | ||
932 | { | ||
933 | return ERR_PTR(-ENOENT); | ||
934 | } | ||
935 | |||
936 | static inline unsigned long bad_hva(void) | 925 | static inline unsigned long bad_hva(void) |
937 | { | 926 | { |
938 | return PAGE_OFFSET; | 927 | return PAGE_OFFSET; |
@@ -1179,7 +1168,7 @@ static struct page *kvm_pfn_to_page(pfn_t pfn) | |||
1179 | WARN_ON(kvm_is_mmio_pfn(pfn)); | 1168 | WARN_ON(kvm_is_mmio_pfn(pfn)); |
1180 | 1169 | ||
1181 | if (is_error_pfn(pfn) || kvm_is_mmio_pfn(pfn)) | 1170 | if (is_error_pfn(pfn) || kvm_is_mmio_pfn(pfn)) |
1182 | return get_bad_page(); | 1171 | return KVM_ERR_PTR_BAD_PAGE; |
1183 | 1172 | ||
1184 | return pfn_to_page(pfn); | 1173 | return pfn_to_page(pfn); |
1185 | } | 1174 | } |