KVM: introduce KVM_PFN_ERR_BAD

Xiao Guangrong · avikivity · commit 950e95097b1c · 2012-08-06T16:04:52.000+03:00
Then, remove get_bad_pfn

Signed-off-by: Xiao Guangrong &lt;xiaoguangrong@linux.vnet.ibm.com&gt;
Signed-off-by: Avi Kivity &lt;avi@redhat.com&gt;
diff --git 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
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -934,11 +934,6 @@ int is_error_pfn(pfn_t pfn)`
`934`	`934`	`}`
`935`	`935`	`EXPORT_SYMBOL_GPL(is_error_pfn);`
`936`	`936`
`937`		`-static pfn_t get_bad_pfn(void)`
`938`		`-{`
`939`		`- return -ENOENT;`
`940`		`-}`
`941`		`-`
`942`	`937`	`int is_noslot_pfn(pfn_t pfn)`
`943`	`938`	`{`
`944`	`939`	`return pfn == -ENOENT;`
`@@ -1143,7 +1138,7 @@ static pfn_t __gfn_to_pfn(struct kvm kvm, gfn_t gfn, bool atomic, bool async,`
`1143`	`1138`
`1144`	`1139`	`addr = gfn_to_hva(kvm, gfn);`
`1145`	`1140`	`if (kvm_is_error_hva(addr))`
`1146`		`- return get_bad_pfn();`
	`1141`	`+ return KVM_PFN_ERR_BAD;`
`1147`	`1142`
`1148`	`1143`	`return hva_to_pfn(addr, atomic, async, write_fault, writable);`
`1149`	`1144`	`}`