Skip to content

Commit 2f54144

Browse files
committed
KVM: remove kvm_clear_guest_page
kvm_clear_guest_page is not used anymore after "KVM: X86: Don't track dirty for KVM_SET_[TSS_ADDR|IDENTITY_MAP_ADDR]", except from kvm_clear_guest. We can just inline it in its sole user. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent ff5a983 commit 2f54144

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

include/linux/kvm_host.h

-1
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,6 @@ int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
792792
offset_in_page(__gpa), v); \
793793
})
794794

795-
int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
796795
int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
797796
struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
798797
bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);

virt/kvm/kvm_main.c

+2-9
Original file line numberDiff line numberDiff line change
@@ -2616,23 +2616,16 @@ int kvm_read_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
26162616
}
26172617
EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
26182618

2619-
int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
2620-
{
2621-
const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
2622-
2623-
return kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
2624-
}
2625-
EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
2626-
26272619
int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len)
26282620
{
2621+
const void *zero_page = (const void *) __va(page_to_phys(ZERO_PAGE(0)));
26292622
gfn_t gfn = gpa >> PAGE_SHIFT;
26302623
int seg;
26312624
int offset = offset_in_page(gpa);
26322625
int ret;
26332626

26342627
while ((seg = next_segment(len, offset)) != 0) {
2635-
ret = kvm_clear_guest_page(kvm, gfn, offset, seg);
2628+
ret = kvm_write_guest_page(kvm, gfn, zero_page, offset, len);
26362629
if (ret < 0)
26372630
return ret;
26382631
offset = 0;

0 commit comments

Comments
 (0)