kvm tools: Rename disk_image__{read, write}_sector_iov

This patch renames disk_image__{read, write}_sector_io to
disk_image__{read, write}.

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c
index 4622e99fb085a35cd70e11b083e1f4f4fefd6523..3b12fff841f59cb6f94c160c4432cdfa10430a1b 100644 (file)
--- a/tools/kvm/disk/core.c
+++ b/tools/kvm/disk/core.c
@@ -75,7 +75,7 @@ void disk_image__close(struct disk_image *disk)
 }
 
 /* Fill iov with disk data, starting from sector 'sector'. Return amount of bytes read. */
-ssize_t disk_image__read_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
+ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
 {
        u64 first_sector = sector;
 
@@ -94,7 +94,7 @@ ssize_t disk_image__read_sector_iov(struct disk_image *disk, u64 sector, const s
 }
 
 /* Write iov to disk, starting from sector 'sector'. Return amount of bytes written. */
-ssize_t disk_image__write_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
+ssize_t disk_image__write(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
 {
        u64 first_sector = sector;
 

diff --git a/tools/kvm/include/kvm/disk-image.h b/tools/kvm/include/kvm/disk-image.h
index 87bebd385dbc5763e6e5636486274db2d79e30d1..d43457e74b1d4f0778ff2b6325455378e3ef7113 100644 (file)
--- a/tools/kvm/include/kvm/disk-image.h
+++ b/tools/kvm/include/kvm/disk-image.h
@@ -54,8 +54,8 @@ static inline int disk_image__write_sector(struct disk_image *disk, u64 sector,
        return disk->ops->write_sector(disk, sector, src, src_len);
 }
 
-ssize_t disk_image__read_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
-ssize_t disk_image__write_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
+ssize_t disk_image__read(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
+ssize_t disk_image__write(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
 
 static inline int disk_image__flush(struct disk_image *disk)
 {

diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index c9b8a541c203f94eacfddf7b18074f2eb14fe41f..de88fe92423d78b7d046346c3f1a92a5d6e7953d 100644 (file)
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -140,10 +140,10 @@ static bool virtio_blk_do_io_request(struct kvm *kvm,
 
        switch (req->type) {
        case VIRTIO_BLK_T_IN:
-               block_cnt       = disk_image__read_sector_iov(bdev->disk, req->sector, iov + 1, in + out - 2);
+               block_cnt       = disk_image__read(bdev->disk, req->sector, iov + 1, in + out - 2);
                break;
        case VIRTIO_BLK_T_OUT:
-               block_cnt       = disk_image__write_sector_iov(bdev->disk, req->sector, iov + 1, in + out - 2);
+               block_cnt       = disk_image__write(bdev->disk, req->sector, iov + 1, in + out - 2);
                break;
        case VIRTIO_BLK_T_FLUSH:
                block_cnt       = disk_image__flush(bdev->disk);