lkml.org 
[lkml]   [2012]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 4/9] KVM: define kvm_bad_pfn statically
Then, remove get_bad_pfn

Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
---
include/linux/kvm_host.h | 1 +
virt/kvm/kvm_main.c | 7 +------
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 4de56cd..b02203f 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -50,6 +50,7 @@

#define kvm_fault_pfn (-EFAULT)
#define kvm_hwpoison_pfn (-EHWPOISON)
+#define kvm_bad_pfn (-ENOENT)

/*
* vcpu->requests bit members
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 390a03d..da16191 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -943,11 +943,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;
@@ -1152,7 +1147,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_bad_pfn;

return hva_to_pfn(addr, atomic, async, write_fault, writable);
}
--
1.7.7.6


\
 
 \ /
  Last update: 2012-07-29 11:01    [W:1.100 / U:0.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site