kvm tools: Prefix error() and friends helpers with pr_

[karo-tx-linux.git] / tools / kvm / kvm.c

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index fcb3d5859cb3334139e50238e142d19b70b793b5..815cacfe30e682d6b8b65db37484e340139ecdd8 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -84,7 +84,7 @@ static int kvm__check_extensions(struct kvm *kvm)
 
        for (i = 0; i < ARRAY_SIZE(kvm_req_ext); i++) {
                if (!kvm__supports_extension(kvm, kvm_req_ext[i].code)) {
-                       error("Unsuppored KVM extension detected: %s",
+                       pr_error("Unsuppored KVM extension detected: %s",
                                kvm_req_ext[i].name);
                        return (int)-i;
                }
@@ -162,7 +162,7 @@ static void kvm_register_mem_slot(struct kvm *kvm, u32 slot, u64 guest_phys, u64
                .slot                   = slot,
                .guest_phys_addr        = guest_phys,
                .memory_size            = size,
-               .userspace_addr         = (u64)userspace_addr,
+               .userspace_addr         = (unsigned long)userspace_addr,
        };
 
        ret = ioctl(kvm->vm_fd, KVM_SET_USER_MEMORY_REGION, &mem);
@@ -267,9 +267,9 @@ struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size)
        kvm->ram_size           = ram_size;
 
        if (kvm->ram_size < KVM_32BIT_GAP_START) {
-               kvm->ram_start = mmap(NULL, ram_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+               kvm->ram_start = mmap(NULL, ram_size, PROT_RW, MAP_ANON_NORESERVE, -1, 0);
        } else {
-               kvm->ram_start = mmap(NULL, ram_size + KVM_32BIT_GAP_SIZE, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0);
+               kvm->ram_start = mmap(NULL, ram_size + KVM_32BIT_GAP_SIZE, PROT_RW, MAP_ANON_NORESERVE, -1, 0);
                if (kvm->ram_start != MAP_FAILED) {
                        /*
                         * We mprotect the gap (see kvm__init_ram() for details) PROT_NONE so that
@@ -446,7 +446,7 @@ bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename,
        if (ret)
                goto found_kernel;
 
-       warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename);
+       pr_warning("%s is not a bzImage. Trying to load it as a flat binary...", kernel_filename);
 
        ret = load_flat_binary(kvm, fd_kernel);
        if (ret)