Commit-ID: a8adaa363de7d212aa306494f58eb6809ee2855e
Gitweb: http://git.kernel.org/tip/a8adaa363de7d212aa306494f58eb6809ee2855e
Author: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
AuthorDate: Sun, 22 May 2011 17:24:07 +0100
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sun, 22 May 2011 23:06:37 +0300
kvm tools: Release memory allocated during virtio block initialization
Add a new function virtio_blk__delete() goes through array of block
devices and releases memory allocated for block device.
Signed-off-by: Prasad Joshi <prasadjoshi124@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/include/kvm/virtio-blk.h | 1 +
tools/kvm/kvm-run.c | 2 ++
tools/kvm/virtio/blk.c | 8 ++++++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/tools/kvm/include/kvm/virtio-blk.h b/tools/kvm/include/kvm/virtio-blk.h
index 72f6491..8c4fb91 100644
--- a/tools/kvm/include/kvm/virtio-blk.h
+++ b/tools/kvm/include/kvm/virtio-blk.h
@@ -7,5 +7,6 @@ struct kvm;
void virtio_blk__init(struct kvm *kvm, struct disk_image *disk);
void virtio_blk__init_all(struct kvm *kvm);
+void virtio_blk__delete_all(struct kvm *kvm);
#endif /* KVM__BLK_VIRTIO_H */
diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index eacde81..288e1fb 100644
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -617,6 +617,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
exit_code = 1;
}
+ virtio_blk__delete_all(kvm);
+
disk_image__close_all(kvm->disks, image_count);
kvm__delete(kvm);
diff --git a/tools/kvm/virtio/blk.c b/tools/kvm/virtio/blk.c
index 224e14c..25ce61f 100644
--- a/tools/kvm/virtio/blk.c
+++ b/tools/kvm/virtio/blk.c
@@ -328,3 +328,11 @@ void virtio_blk__init_all(struct kvm *kvm)
for (i = 0; i < kvm->nr_disks; i++)
virtio_blk__init(kvm, kvm->disks[i]);
}
+
+void virtio_blk__delete_all(struct kvm *kvm)
+{
+ int i;
+
+ for (i = 0; i < kvm->nr_disks; i++)
+ free(bdevs[i]);
+}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|