aboutsummaryrefslogtreecommitdiffstats
path: root/virt
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-05-19 10:01:50 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2015-05-28 04:43:33 -0400
commitd9ef13c2b3983de8dd1373ef670799dbb6498122 (patch)
tree8fa5aedbdb534029ca8a69d1b4608720fd90e817 /virt
parentf36f3f2846b5578d62910ee0b6dbef59fdd1cfa4 (diff)
KVM: pass kvm_memory_slot to gfn_to_page_many_atomic
The memory slot is already available from gfn_to_memslot_dirty_bitmap. Isn't it a shame to look it up again? Plus, it makes gfn_to_page_many_atomic agnostic of multiple VCPU address spaces. Reviewed-by: Radim Krcmar <rkrcmar@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r--virt/kvm/kvm_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9f67c942d8ee..c57f44216a4e 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1428,13 +1428,13 @@ pfn_t gfn_to_pfn_memslot_atomic(struct kvm_memory_slot *slot, gfn_t gfn)
1428} 1428}
1429EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic); 1429EXPORT_SYMBOL_GPL(gfn_to_pfn_memslot_atomic);
1430 1430
1431int gfn_to_page_many_atomic(struct kvm *kvm, gfn_t gfn, struct page **pages, 1431int gfn_to_page_many_atomic(struct kvm_memory_slot *slot, gfn_t gfn,
1432 int nr_pages) 1432 struct page **pages, int nr_pages)
1433{ 1433{
1434 unsigned long addr; 1434 unsigned long addr;
1435 gfn_t entry; 1435 gfn_t entry;
1436 1436
1437 addr = gfn_to_hva_many(gfn_to_memslot(kvm, gfn), gfn, &entry); 1437 addr = gfn_to_hva_many(slot, gfn, &entry);
1438 if (kvm_is_error_hva(addr)) 1438 if (kvm_is_error_hva(addr))
1439 return -1; 1439 return -1;
1440 1440