clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-04 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Split blk device code from raw.c to blk.c

Browse Source 
Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Asias He
2015-06-01 16:39:44 +01:00
committed by Will Deacon
parent 7d22135f61
commit 708dc6cb4d
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -39,6 +39,7 @@ OBJS += kvm-run.o
OBJS += disk/qcow.o
OBJS += disk/core.o
OBJS += disk/raw.o
OBJS += disk/blk.o
OBJS += mptable.o
OBJS += threadpool.o
OBJS += irq.o
disk/blk.c
+30
View File
@@ -0,0 +1,30 @@
#include "kvm/disk-image.h"
/*
* raw image and blk dev are similar, so reuse raw image ops.
*/
static struct disk_image_operations raw_image_ro_mmap_ops = {
.read_sector = raw_image__read_sector_ro_mmap,
.write_sector = raw_image__write_sector_ro_mmap,
.close = raw_image__close_ro_mmap,
};
struct disk_image *blkdev__probe(const char *filename, struct stat *st)
{
u64 size;
int fd;
if (!S_ISBLK(st->st_mode))
return NULL;
fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
if (ioctl(fd, BLKGETSIZE64, &size) < 0) {
close(fd);
return NULL;
}
return disk_image__new(fd, size, &raw_image_ro_mmap_ops, DISK_IMAGE_MMAP);
}
disk/raw.c
+6 -26
View File
@@ -1,20 +1,20 @@
#include "kvm/disk-image.h"
static ssize_t raw_image__read_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
ssize_t raw_image__read_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
{
u64 offset = sector << SECTOR_SHIFT;
return preadv_in_full(disk->fd, iov, iovcount, offset);
}
static ssize_t raw_image__write_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
ssize_t raw_image__write_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount)
{
u64 offset = sector << SECTOR_SHIFT;
return pwritev_in_full(disk->fd, iov, iovcount, offset);
}
static int raw_image__read_sector_ro_mmap(struct disk_image *disk, u64 sector, void *dst, u32 dst_len)
int raw_image__read_sector_ro_mmap(struct disk_image *disk, u64 sector, void *dst, u32 dst_len)
{
u64 offset = sector << SECTOR_SHIFT;
@@ -26,7 +26,7 @@ static int raw_image__read_sector_ro_mmap(struct disk_image *disk, u64 sector, v
return 0;
}
static int raw_image__write_sector_ro_mmap(struct disk_image *disk, u64 sector, void *src, u32 src_len)
int raw_image__write_sector_ro_mmap(struct disk_image *disk, u64 sector, void *src, u32 src_len)
{
u64 offset = sector << SECTOR_SHIFT;
@@ -38,7 +38,7 @@ static int raw_image__write_sector_ro_mmap(struct disk_image *disk, u64 sector,
return 0;
}
static void raw_image__close_ro_mmap(struct disk_image *disk)
void raw_image__close_ro_mmap(struct disk_image *disk)
{
if (disk->priv != MAP_FAILED)
munmap(disk->priv, disk->size);
@@ -46,7 +46,7 @@ static void raw_image__close_ro_mmap(struct disk_image *disk)
static struct disk_image_operations raw_image_ops = {
.read_sector_iov = raw_image__read_sector_iov,
.write_sector_iov = raw_image__write_sector_iov
.write_sector_iov = raw_image__write_sector_iov,
};
static struct disk_image_operations raw_image_ro_mmap_ops = {
@@ -70,23 +70,3 @@ struct disk_image *raw_image__probe(int fd, struct stat *st, bool readonly)
*/
return disk_image__new(fd, st->st_size, &raw_image_ops, DISK_IMAGE_NOMMAP);
}
struct disk_image *blkdev__probe(const char *filename, struct stat *st)
{
u64 size;
int fd;
if (!S_ISBLK(st->st_mode))
return NULL;
fd = open(filename, O_RDONLY);
if (fd < 0)
return NULL;
if (ioctl(fd, BLKGETSIZE64, &size) < 0) {
close(fd);
return NULL;
}
return disk_image__new(fd, size, &raw_image_ro_mmap_ops, DISK_IMAGE_MMAP);
}
include/kvm/disk-image.h
+6
View File
@@ -59,4 +59,10 @@ static inline int disk_image__flush(struct disk_image *disk)
struct disk_image *raw_image__probe(int fd, struct stat *st, bool readonly);
struct disk_image *blkdev__probe(const char *filename, struct stat *st);
ssize_t raw_image__read_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
ssize_t raw_image__write_sector_iov(struct disk_image *disk, u64 sector, const struct iovec *iov, int iovcount);
int raw_image__read_sector_ro_mmap(struct disk_image *disk, u64 sector, void *dst, u32 dst_len);
int raw_image__write_sector_ro_mmap(struct disk_image *disk, u64 sector, void *src, u32 src_len);
void raw_image__close_ro_mmap(struct disk_image *disk);
#endif /* KVM__DISK_IMAGE_H */