From mboxrd@z Thu Jan 1 00:00:00 1970 From: Asias He Subject: [PATCH 10/14] kvm tools: Rename raw_image_ops to blk_dev_ops Date: Wed, 18 May 2011 16:19:11 +0800 Message-ID: <1305706755-2816-10-git-send-email-asias.hejun@gmail.com> References: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> Cc: Cyrill Gorcunov , Ingo Molnar , Sasha Levin , Prasad Joshi , kvm@vger.kernel.org, Asias He To: Pekka Enberg Return-path: Received: from mail-pv0-f174.google.com ([74.125.83.174]:53347 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755638Ab1ERIXf (ORCPT ); Wed, 18 May 2011 04:23:35 -0400 Received: by pvg12 with SMTP id 12so602294pvg.19 for ; Wed, 18 May 2011 01:23:34 -0700 (PDT) In-Reply-To: <1305706755-2816-1-git-send-email-asias.hejun@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: This patch also adds some comments to disk/blk.c Signed-off-by: Asias He --- tools/kvm/disk/blk.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/kvm/disk/blk.c b/tools/kvm/disk/blk.c index 7383967..59294e8 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); } -- 1.7.5.1