From: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
To: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Avi Kivity <avi@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH 4/9] KVM: define kvm_bad_pfn statically
Date: Sun, 29 Jul 2012 16:14:25 +0800 [thread overview]
Message-ID: <5014F0E1.4010909@linux.vnet.ibm.com> (raw)
In-Reply-To: <5014F053.8020305@linux.vnet.ibm.com>
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
next prev parent reply other threads:[~2012-07-29 8:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-29 8:12 [PATCH 1/9] KVM: iommu: fix releasing unmapped page Xiao Guangrong
2012-07-29 8:12 ` [PATCH 2/9] KVM: define kvm_fault_pfn statically Xiao Guangrong
2012-08-02 12:51 ` Marcelo Tosatti
2012-07-29 8:13 ` [PATCH 3/9] KVM: define kvm_hwpoison_pfn statically Xiao Guangrong
2012-08-02 12:52 ` Marcelo Tosatti
2012-07-29 8:14 ` Xiao Guangrong [this message]
2012-08-02 13:15 ` [PATCH 4/9] KVM: define kvm_bad_pfn statically Marcelo Tosatti
2012-08-03 0:01 ` Paul Mackerras
2012-08-03 8:13 ` Xiao Guangrong
2012-07-29 8:15 ` [PATCH 5/9] KVM: inline is_*_pfn functions Xiao Guangrong
2012-07-29 8:15 ` [PATCH 6/9] KVM: remove the unused declare Xiao Guangrong
2012-07-29 8:16 ` [PATCH 7/9] KVM: define kvm_bad_page statically Xiao Guangrong
2012-08-02 12:54 ` Marcelo Tosatti
2012-07-29 8:18 ` [PATCH 8/9] KVM: do not release the error pfn Xiao Guangrong
2012-07-29 11:33 ` Xiao Guangrong
2012-08-02 13:14 ` Marcelo Tosatti
2012-08-03 7:46 ` Xiao Guangrong
2012-07-29 8:20 ` [PATCH 9/9] KVM: do not release the error page Xiao Guangrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5014F0E1.4010909@linux.vnet.ibm.com \
--to=xiaoguangrong@linux.vnet.ibm.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).