The patch moves the code for initialization of all of the virtio block devices to virtio subsystem.
Signed-off-by: Prasad Joshi <[email protected]> --- tools/kvm/include/kvm/kvm.h | 1 + tools/kvm/include/kvm/virtio-blk.h | 1 + tools/kvm/kvm-run.c | 4 ++-- tools/kvm/virtio/blk.c | 8 ++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index f419634..9592ce7 100644 --- 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 ndisks; }; 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 22983e8..72f6491 100644 --- 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 32b34fe..6c96337 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -529,14 +529,14 @@ 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)); + kvm->ndisks = image_count; kvm->disks = disk_image__open_all(image_filename, readonly_image, image_count); if (!kvm->disks) die("Unable to load all disk images."); free(hi); - for (i = 0; i < image_count; i++) - virtio_blk__init(kvm, kvm->disks[i]); + virtio_blk__init_all(kvm); printf(" # kvm run -k %s -m %Lu -c %d\n", kernel_filename, ram_size / 1024 / 1024, nrcpus); diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c index c5d1bb8..2ee5854 100644 --- 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->ndisks; i++) + virtio_blk__init(kvm, kvm->disks[i]); +} -- 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
