From d2e1583f5b8b6be69deb116429834edb5148f7b0 Mon Sep 17 00:00:00 2001 From: Asias He Date: Wed, 18 May 2011 16:19:11 +0800 Subject: [PATCH] kvm tools: Rename raw_image_ops to blk_dev_ops This patch also adds some comments to disk/blk.c Signed-off-by: Asias He Signed-off-by: Pekka Enberg --- tools/kvm/disk/blk.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/kvm/disk/blk.c b/tools/kvm/disk/blk.c index 7383967c95a4..59294e841dc1 100644 --- a/tools/kvm/disk/blk.c +++ b/tools/kvm/disk/blk.c @@ -3,7 +3,7 @@ /* * raw image and blk dev are similar, so reuse raw image ops. */ -static struct disk_image_operations raw_image_ops = { +static struct disk_image_operations blk_dev_ops = { .read_sector = raw_image__read_sector, .write_sector = raw_image__write_sector, .close = raw_image__close, @@ -17,7 +17,11 @@ struct disk_image *blkdev__probe(const char *filename, struct stat *st) if (!S_ISBLK(st->st_mode)) return NULL; - fd = open(filename, O_RDONLY); + /* + * Be careful! We are opening host block device! + * Open it readonly since we do not want to break user's data on disk. + */ + fd = open(filename, O_RDONLY); if (fd < 0) return NULL; @@ -26,5 +30,10 @@ struct disk_image *blkdev__probe(const char *filename, struct stat *st) return NULL; } - return disk_image__new(fd, size, &raw_image_ops, DISK_IMAGE_MMAP); + /* + * FIXME: This will not work on 32-bit host because we can not + * mmap large disk. There is not enough virtual address space + * in 32-bit host. However, this works on 64-bit host. + */ + return disk_image__new(fd, size, &blk_dev_ops, DISK_IMAGE_MMAP); } -- 2.39.5