Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Xiao Guangrong 2012-08-03 15:39:19 +08:00 committed by Avi Kivity
parent e6c1502b3f
commit 950e95097b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/kvm_host.h
View File

@ -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

7
virt/kvm/kvm_main.c
View File

@ -934,11 +934,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;
@ -1143,7 +1138,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);
}