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

kvm tools: Avoid using disk_image->priv member in disk_image__new()

Browse Source 
The disk_image->priv is supposed to be a private member for users of
disk_image__new(). The other block device drivers, for example qcow, might need
this pointer to hold their header.

Added a new function disk_image__new_readonly() which calls disk_image__new()
to allocate a new disk and then sets the priv member to mmamped address.

Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Prasad Joshi
2015-06-01 16:39:42 +01:00
committed by Will Deacon
parent 4f56d42c78
commit f4ff38df31
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
disk-image.c
+20 -9
View File
@@ -13,7 +13,7 @@
#include <unistd.h>
#include <fcntl.h>
struct disk_image *disk_image__new(int fd, uint64_t size, struct disk_image_operations *ops, bool readonly)
struct disk_image *disk_image__new(int fd, uint64_t size, struct disk_image_operations *ops)
{
struct disk_image *self;
@@ -24,16 +24,24 @@ struct disk_image *disk_image__new(int fd, uint64_t size, struct disk_image_oper
self->fd = fd;
self->size = size;
self->ops = ops;
if (readonly) {
self->priv = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_NORESERVE, fd, 0);
if (self->priv == MAP_FAILED)
die("mmap() failed");
} else
self->priv = MAP_FAILED;
return self;
}
struct disk_image *disk_image__new_readonly(int fd, uint64_t size, struct disk_image_operations *ops)
{
struct disk_image *self;
self = disk_image__new(fd, size, ops);
if (!self)
return NULL;
self->priv = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_NORESERVE, fd, 0);
if (self->priv == MAP_FAILED)
die("mmap() failed");
return self;
}
static int raw_image__read_sector(struct disk_image *self, uint64_t sector, void *dst, uint32_t dst_len)
{
uint64_t offset = sector << SECTOR_SHIFT;
@@ -101,7 +109,10 @@ static struct disk_image *raw_image__probe(int fd, bool readonly)
if (fstat(fd, &st) < 0)
return NULL;
return disk_image__new(fd, st.st_size, readonly ? &raw_image_ro_mmap_ops : &raw_image_ops, readonly);
if (readonly)
return disk_image__new_readonly(fd, st.st_size, &raw_image_ro_mmap_ops);
else
return disk_image__new(fd, st.st_size, &raw_image_ops);
}
struct disk_image *disk_image__open(const char *filename, bool readonly)
include/kvm/disk-image.h
+2 -1
View File
@@ -23,7 +23,8 @@ struct disk_image {
};
struct disk_image *disk_image__open(const char *filename, bool readonly);
struct disk_image *disk_image__new(int fd, uint64_t size, struct disk_image_operations *ops, bool readonly);
struct disk_image *disk_image__new(int fd, uint64_t size, struct disk_image_operations *ops);
struct disk_image *disk_image__new_readonly(int fd, uint64_t size, struct disk_image_operations *ops);
void disk_image__close(struct disk_image *self);
static inline int disk_image__read_sector(struct disk_image *self, uint64_t sector, void *dst, uint32_t dst_len)