aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorXiao Guangrong2012-08-03 02:41:22 -0500
committerAvi Kivity2012-08-06 08:04:55 -0500
commit6cede2e6794be6b0649f62d3681e0c4aff5a9270 (patch)
treeb05fdcfd0db7974c7ed7f036d07520ac4c12202f /virt
parent9a592a953880fd6981955e69c1476ce541d9bd16 (diff)
downloadkernel-common-6cede2e6794be6b0649f62d3681e0c4aff5a9270.tar.gz
kernel-common-6cede2e6794be6b0649f62d3681e0c4aff5a9270.tar.xz
kernel-common-6cede2e6794be6b0649f62d3681e0c4aff5a9270.zip
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')
-rw-r--r--virt/kvm/async_pf.c2
-rw-r--r--virt/kvm/kvm_main.c13
2 files changed, 2 insertions, 13 deletions
diff --git a/virt/kvm/async_pf.c b/virt/kvm/async_pf.c
index 79722782d9d..56f55339189 100644
--- a/virt/kvm/async_pf.c
+++ b/virt/kvm/async_pf.c
@@ -203,7 +203,7 @@ int kvm_async_pf_wakeup_all(struct kvm_vcpu *vcpu)
203 if (!work) 203 if (!work)
204 return -ENOMEM; 204 return -ENOMEM;
205 205
206 work->page = get_bad_page(); 206 work->page = KVM_ERR_PTR_BAD_PAGE;
207 INIT_LIST_HEAD(&work->queue); /* for list_del to work */ 207 INIT_LIST_HEAD(&work->queue); /* for list_del to work */
208 208
209 spin_lock(&vcpu->async_pf.lock); 209 spin_lock(&vcpu->async_pf.lock);
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index eb73e5f1367..93d3c6e063c 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -922,17 +922,6 @@ void kvm_disable_largepages(void)
922} 922}
923EXPORT_SYMBOL_GPL(kvm_disable_largepages); 923EXPORT_SYMBOL_GPL(kvm_disable_largepages);
924 924
925int is_error_page(struct page *page)
926{
927 return IS_ERR(page);
928}
929EXPORT_SYMBOL_GPL(is_error_page);
930
931struct page *get_bad_page(void)
932{
933 return ERR_PTR(-ENOENT);
934}
935
936static inline unsigned long bad_hva(void) 925static 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}