From f05ef3f6f78e6b97f5664a8290f1ac0717b1a1b0 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 2 Nov 2011 07:41:05 +0200 Subject: [PATCH] kvm tools: Switch to using an enum for disk image types Signed-off-by: Sasha Levin Signed-off-by: Pekka Enberg --- tools/kvm/disk/qcow.c | 8 ++++---- tools/kvm/disk/raw.c | 2 +- tools/kvm/include/kvm/disk-image.h | 7 +++++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/kvm/disk/qcow.c b/tools/kvm/disk/qcow.c index 167e97efa49f..bdf6bd8bca40 100644 --- a/tools/kvm/disk/qcow.c +++ b/tools/kvm/disk/qcow.c @@ -1107,9 +1107,9 @@ static struct disk_image *qcow2_probe(int fd, bool readonly) * Do not use mmap use read/write instead */ if (readonly) - disk_image = disk_image__new(fd, h->size, &qcow_disk_readonly_ops, DISK_IMAGE_NOMMAP); + disk_image = disk_image__new(fd, h->size, &qcow_disk_readonly_ops, DISK_IMAGE_REGULAR); else - disk_image = disk_image__new(fd, h->size, &qcow_disk_ops, DISK_IMAGE_NOMMAP); + disk_image = disk_image__new(fd, h->size, &qcow_disk_ops, DISK_IMAGE_REGULAR); if (!disk_image) goto free_refcount_table; @@ -1238,9 +1238,9 @@ static struct disk_image *qcow1_probe(int fd, bool readonly) * Do not use mmap use read/write instead */ if (readonly) - disk_image = disk_image__new(fd, h->size, &qcow_disk_readonly_ops, DISK_IMAGE_NOMMAP); + disk_image = disk_image__new(fd, h->size, &qcow_disk_readonly_ops, DISK_IMAGE_REGULAR); else - disk_image = disk_image__new(fd, h->size, &qcow_disk_ops, DISK_IMAGE_NOMMAP); + disk_image = disk_image__new(fd, h->size, &qcow_disk_ops, DISK_IMAGE_REGULAR); if (!disk_image) goto free_l1_table; diff --git a/tools/kvm/disk/raw.c b/tools/kvm/disk/raw.c index 7f3f8db5014b..66c52be6f70a 100644 --- a/tools/kvm/disk/raw.c +++ b/tools/kvm/disk/raw.c @@ -78,5 +78,5 @@ struct disk_image *raw_image__probe(int fd, struct stat *st, bool readonly) /* * Use read/write instead of mmap */ - return disk_image__new(fd, st->st_size, &raw_image_iov_ops, DISK_IMAGE_NOMMAP); + return disk_image__new(fd, st->st_size, &raw_image_iov_ops, DISK_IMAGE_REGULAR); } diff --git a/tools/kvm/include/kvm/disk-image.h b/tools/kvm/include/kvm/disk-image.h index 75b54f90cc32..6acde5357778 100644 --- a/tools/kvm/include/kvm/disk-image.h +++ b/tools/kvm/include/kvm/disk-image.h @@ -21,8 +21,11 @@ #define SECTOR_SHIFT 9 #define SECTOR_SIZE (1UL << SECTOR_SHIFT) -#define DISK_IMAGE_MMAP 0 -#define DISK_IMAGE_NOMMAP 1 +enum { + DISK_IMAGE_REGULAR, + DISK_IMAGE_MMAP, +}; + #define MAX_DISK_IMAGES 4 struct disk_image; -- 2.39.5