kvm tools: Add a wrapper function to initialize all virtio block devices

The patch moves the code for initialization of all of the virtio block
devices to virtio subsystem.

Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index f419634e80c29cf0618ad38e2cc784f33176c06e..08c6fdac11fb9801483e93e701db4a6a65282fb4 100644 (file)
--- a/tools/kvm/include/kvm/kvm.h
+++ b/tools/kvm/include/kvm/kvm.h
@@ -33,6 +33,7 @@ struct kvm {
 
        const char              *vmlinux;
        struct disk_image       **disks;
+       int                     nr_disks;
 };
 
 struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size);

diff --git a/tools/kvm/include/kvm/virtio-blk.h b/tools/kvm/include/kvm/virtio-blk.h
index 22983e856f459193c443576f398bfdfcb2627e72..72f6491066055e87a76ffbc083ca1129527b7108 100644 (file)
--- a/tools/kvm/include/kvm/virtio-blk.h
+++ b/tools/kvm/include/kvm/virtio-blk.h
@@ -6,5 +6,6 @@
 struct kvm;
 
 void virtio_blk__init(struct kvm *kvm, struct disk_image *disk);
+void virtio_blk__init_all(struct kvm *kvm);
 
 #endif /* KVM__BLK_VIRTIO_H */

diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index 8cd003b69a9ac269c3eeee8d5ef312650a4f0f9f..eacde818b70bdabeaa80a96311f7b2ffdc6a4757 100644 (file)
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -530,12 +530,12 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
                strlcat(real_cmdline, " root=/dev/vda rw ", sizeof(real_cmdline));
 
        if (image_count) {
-               kvm->disks = disk_image__open_all(image_filename, readonly_image, image_count);
+               kvm->nr_disks = image_count;
+               kvm->disks    = disk_image__open_all(image_filename, readonly_image, image_count);
                if (!kvm->disks)
                        die("Unable to load all disk images.");
 
-               for (i = 0; i < image_count; i++)
-                       virtio_blk__init(kvm, kvm->disks[i]);
+               virtio_blk__init_all(kvm);
        }
 
        free(hi);

diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index c5d1bb81eb5c157ba294c289c546e119596ead68..224e14c433b9fbc3f1cdfc5482d8f1ab52e79032 100644 (file)
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -320,3 +320,11 @@ void virtio_blk__init(struct kvm *kvm, struct disk_image *disk)
 
        ioport__register(blk_dev_base_addr, &virtio_blk_io_ops, IOPORT_VIRTIO_BLK_SIZE);
 }
+
+void virtio_blk__init_all(struct kvm *kvm)
+{
+       int i;
+
+       for (i = 0; i < kvm->nr_disks; i++)
+               virtio_blk__init(kvm, kvm->disks[i]);
+}