]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
KVM: Simplify kvm_clear_guest_page()
authorIzik Eidus <izike@qumranet.com>
Mon, 19 Nov 2007 09:16:57 +0000 (11:16 +0200)
committerAvi Kivity <avi@qumranet.com>
Wed, 30 Jan 2008 15:53:06 +0000 (17:53 +0200)
Use kvm_write_guest_page() with empty_zero_page, instead of doing
kmap and memset.

Signed-off-by: Izik Eidus <izike@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
drivers/kvm/kvm_main.c

index 595ed323fc538298e7ba9310713d921c9af6f548..e83a178dc80f4bc9d17005eb52da2a6cc11fef71 100644 (file)
@@ -46,6 +46,7 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/desc.h>
+#include <asm/pgtable.h>
 
 MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
@@ -633,22 +634,7 @@ int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
 
 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
 {
-       void *page_virt;
-       struct page *page;
-
-       page = gfn_to_page(kvm, gfn);
-       if (is_error_page(page)) {
-               kvm_release_page(page);
-               return -EFAULT;
-       }
-       page_virt = kmap_atomic(page, KM_USER0);
-
-       memset(page_virt + offset, 0, len);
-
-       kunmap_atomic(page_virt, KM_USER0);
-       kvm_release_page(page);
-       mark_page_dirty(kvm, gfn);
-       return 0;
+       return kvm_write_guest_page(kvm, gfn, empty_zero_page, offset, len);
 }
 EXPORT_SYMBOL_GPL(kvm_clear_guest_page);