[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20230704075054.3344915-9-stevensd@google.com>
Date: Tue, 4 Jul 2023 16:50:53 +0900
From: David Stevens <stevensd@...omium.org>
To: Sean Christopherson <seanjc@...gle.com>
Cc: Marc Zyngier <maz@...nel.org>,
Michael Ellerman <mpe@...erman.id.au>,
Peter Xu <peterx@...hat.com>,
linux-arm-kernel@...ts.infradead.org, kvmarm@...ts.linux.dev,
linux-kernel@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
kvm@...r.kernel.org, David Stevens <stevensd@...omium.org>
Subject: [PATCH v7 8/8] KVM: remove __gfn_to_pfn_memslot
From: David Stevens <stevensd@...omium.org>
All callers have been migrated to __kvm_follow_pfn.
Signed-off-by: David Stevens <stevensd@...omium.org>
---
virt/kvm/kvm_main.c | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 0f7b41f220b6..5b5afd70f239 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2712,39 +2712,6 @@ kvm_pfn_t __kvm_follow_pfn(struct kvm_follow_pfn *foll)
}
EXPORT_SYMBOL_GPL(__kvm_follow_pfn);
-kvm_pfn_t __gfn_to_pfn_memslot(const struct kvm_memory_slot *slot, gfn_t gfn,
- bool atomic, bool interruptible, bool *async,
- bool write_fault, bool *writable, hva_t *hva)
-{
- kvm_pfn_t pfn;
- struct kvm_follow_pfn foll = {
- .slot = slot,
- .gfn = gfn,
- .flags = FOLL_GET,
- .atomic = atomic,
- .allow_write_mapping = !!writable,
- };
-
- if (write_fault)
- foll.flags |= FOLL_WRITE;
- if (async)
- foll.flags |= FOLL_NOWAIT;
- if (interruptible)
- foll.flags |= FOLL_INTERRUPTIBLE;
-
- pfn = __kvm_follow_pfn(&foll);
- if (pfn == KVM_PFN_ERR_NEEDS_IO) {
- *async = true;
- pfn = KVM_PFN_ERR_FAULT;
- }
- if (hva)
- *hva = foll.hva;
- if (writable)
- *writable = foll.writable;
- return pfn;
-}
-EXPORT_SYMBOL_GPL(__gfn_to_pfn_memslot);
-
kvm_pfn_t gfn_to_pfn_prot(struct kvm *kvm, gfn_t gfn, bool write_fault,
bool *writable)
{
--
2.41.0.255.g8b1d071c50-goog
Powered by blists - more mailing lists