From mboxrd@z Thu Jan 1 00:00:00 1970 From: Prasad Joshi Subject: [PATCH v2 4/4] kvm tools: Release memory allocated during virtio block initialization Date: Fri, 20 May 2011 16:02:40 +0100 Message-ID: <1305903760-7804-4-git-send-email-prasadjoshi124@gmail.com> References: <1305903760-7804-1-git-send-email-prasadjoshi124@gmail.com> Cc: mingo@elte.hu, kvm@vger.kernel.org, penberg@kernel.org, asias.hejun@gmail.com, gorcunov@gmail.com, levinsasha928@gmail.com, chaitanyakulkarni15@gmail.com, ashwini.kulkarni@gmail.com To: prasadjoshi124@gmail.com Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:60808 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756735Ab1ETPDW (ORCPT ); Fri, 20 May 2011 11:03:22 -0400 Received: by mail-ww0-f44.google.com with SMTP id 36so4116827wwa.1 for ; Fri, 20 May 2011 08:03:22 -0700 (PDT) In-Reply-To: <1305903760-7804-1-git-send-email-prasadjoshi124@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: 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 --- 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 6b0c1fd..1acfa36 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -615,6 +615,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 2ee5854..3981cb4 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->ndisks; i++) virtio_blk__init(kvm, kvm->disks[i]); } + +void virtio_blk__delete_all(struct kvm *kvm) +{ + int i; + + for (i = 0; i < kvm->ndisks; i++) + free(bdevs[i]); +} -- 1.7.4.1