kvm tools: Use constants for commonly used mmap flags

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/disk-image.c b/tools/kvm/disk-image.c
index 0bda8db722111b660a4e1e62e94324d321c44c95..bddbdb349c0185976a5a742d9225e33875adf89d 100644 (file)
--- a/tools/kvm/disk-image.c
+++ b/tools/kvm/disk-image.c
@@ -39,7 +39,7 @@ struct disk_image *disk_image__new_readonly(int fd, u64 size, struct disk_image_
        if (!disk)
                return NULL;
 
-       disk->priv = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_NORESERVE, fd, 0);
+       disk->priv = mmap(NULL, size, PROT_RW, MAP_PRIVATE | MAP_NORESERVE, fd, 0);
        if (disk->priv == MAP_FAILED)
                die("mmap() failed");
        return disk;

diff --git a/tools/kvm/include/kvm/util.h b/tools/kvm/include/kvm/util.h
index f60c7395a945a753cf83febd6e9a136e92ba2b60..ed2de03e502008da7e771f34693a1fbb0c20c10d 100644 (file)
--- a/tools/kvm/include/kvm/util.h
+++ b/tools/kvm/include/kvm/util.h
@@ -32,6 +32,9 @@
 
 extern bool do_debug_print;
 
+#define PROT_RW (PROT_READ|PROT_WRITE)
+#define MAP_ANON_NORESERVE (MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE)
+
 extern void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2)));
 extern void die_perror(const char *s) NORETURN;
 extern int error(const char *err, ...) __attribute__((format (printf, 1, 2)));

diff --git a/tools/kvm/kvm-cpu.c b/tools/kvm/kvm-cpu.c
index e69049d650a852ec8a852cd5df66ca7e00f49ad3..8a27e029fd1c6f02556cdbdad97e2b57fce28d43 100644 (file)
--- a/tools/kvm/kvm-cpu.c
+++ b/tools/kvm/kvm-cpu.c
@@ -81,7 +81,7 @@ struct kvm_cpu *kvm_cpu__init(struct kvm *kvm, unsigned long cpu_id)
        if (mmap_size < 0)
                die_perror("KVM_GET_VCPU_MMAP_SIZE ioctl");
 
-       vcpu->kvm_run = mmap(NULL, mmap_size, PROT_READ|PROT_WRITE, MAP_SHARED, vcpu->vcpu_fd, 0);
+       vcpu->kvm_run = mmap(NULL, mmap_size, PROT_RW, MAP_SHARED, vcpu->vcpu_fd, 0);
        if (vcpu->kvm_run == MAP_FAILED)
                die("unable to mmap vcpu fd");
 

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index fcb3d5859cb3334139e50238e142d19b70b793b5..c69fcc45270d41663a65bfab55b4951ef646dc7d 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -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