diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h
index f419634..08c6fda 100644
--- a/include/kvm/kvm.h
+++ b/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/include/kvm/virtio-blk.h b/include/kvm/virtio-blk.h
index 22983e8..72f6491 100644
--- a/include/kvm/virtio-blk.h
+++ b/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/kvm-run.c b/kvm-run.c
index 8cd003b..eacde81 100644
--- a/kvm-run.c
+++ b/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/virtio/blk.c b/virtio/blk.c
index c5d1bb8..224e14c 100644
--- a/virtio/blk.c
+++ b/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]);
+}