The patch was suggested by Ingo to move the disk image subsystem code from the kvm-run.c file. The code to open all of the specified disk images is now moved to a wrapper function in disk/core.c.
Suggested-by: Ingo Molnar <[email protected]> Signed-off-by: Prasad Joshi <[email protected]> --- tools/kvm/disk/core.c | 34 ++++++++++++++++++++++++++++++++++ tools/kvm/include/kvm/disk-image.h | 2 ++ tools/kvm/include/kvm/kvm.h | 1 + tools/kvm/kvm-run.c | 15 ++++++--------- 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/tools/kvm/disk/core.c b/tools/kvm/disk/core.c index 34852a2..fa603cc 100644 --- a/tools/kvm/disk/core.c +++ b/tools/kvm/disk/core.c @@ -59,6 +59,40 @@ struct disk_image *disk_image__open(const char *filename, bool readonly) return NULL; } +struct disk_image **disk_image__open_all(const char **filenames, bool *readonly, int count) +{ + struct disk_image **disks; + int i; + + if (count > MAX_DISK_IMAGES) + return NULL; + + disks = malloc(sizeof(*disks) * count); + if (!disks) + return NULL; + + for (i = 0; i < count; i++) { + if (!filenames[i]) { + disks[i] = NULL; + continue; + } + + disks[i] = disk_image__open(filenames[i], readonly[i]); + if (!disks[i]) { + pr_error("Loading disk image '%s' failed", filenames[i]); + goto error; + } + } + return disks; +error: + if (i > 0) { + while (--i) + disk_image__close(disks[i]); + } + + return NULL; +} + int disk_image__flush(struct disk_image *disk) { if (disk->ops->flush) diff --git a/tools/kvm/include/kvm/disk-image.h b/tools/kvm/include/kvm/disk-image.h index ac394e8..bf2bfa9 100644 --- a/tools/kvm/include/kvm/disk-image.h +++ b/tools/kvm/include/kvm/disk-image.h @@ -23,6 +23,7 @@ #define DISK_IMAGE_MMAP 0 #define DISK_IMAGE_NOMMAP 1 +#define MAX_DISK_IMAGES 4 struct disk_image; @@ -51,6 +52,7 @@ struct disk_image { }; struct disk_image *disk_image__open(const char *filename, bool readonly); +struct disk_image **disk_image__open_all(const char **filenames, bool *readonly, int count); struct disk_image *disk_image__new(int fd, u64 size, struct disk_image_operations *ops, int mmap); int disk_image__close(struct disk_image *disk); int disk_image__flush(struct disk_image *disk); diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index 3cf6e6c..f419634 100644 --- a/tools/kvm/include/kvm/kvm.h +++ b/tools/kvm/include/kvm/kvm.h @@ -32,6 +32,7 @@ struct kvm { struct interrupt_table interrupt_table; const char *vmlinux; + struct disk_image **disks; }; struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size); diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index f7de0fb..28e3ed6 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -44,7 +44,6 @@ #define MB_SHIFT (20) #define MIN_RAM_SIZE_MB (64ULL) #define MIN_RAM_SIZE_BYTE (MIN_RAM_SIZE_MB << MB_SHIFT) -#define MAX_DISK_IMAGES 4 static struct kvm *kvm; static struct kvm_cpu *kvm_cpus[KVM_NR_CPUS]; @@ -530,17 +529,15 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) if (!strstr(real_cmdline, "root=")) strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline)); - for (i = 0; i < image_count; i++) { - if (image_filename[i]) { - struct disk_image *disk = disk_image__open(image_filename[i], readonly_image[i]); - if (!disk) - die("unable to load disk image %s", image_filename[i]); + kvm->disks = disk_image__open_all(image_filename, readonly_image, image_count); + if (!kvm->disks) + die("Unable to load all disk images."); - virtio_blk__init(kvm, disk); - } - } free(hi); + for (i = 0; i < image_count; i++) + virtio_blk__init(kvm, kvm->disks[i]); + printf(" # kvm run -k %s -m %Lu -c %d\n", kernel_filename, ram_size / 1024 / 1024, nrcpus); if (!kvm__load_kernel(kvm, kernel_filename, initrd_filename, -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
