lkml.org 
[lkml]   [2012]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH v2 04/10] KVM: introduce KVM_PFN_ERR_BAD
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 cbd5af8..ba8b222 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 f17ce44..75d3c76 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_PFN_ERR_BAD;

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


\
 
 \ /
  Last update: 2012-08-03 10:22    [W:0.083 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site