From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH] kvm tools: Free memory and FDs on exit Date: Wed, 06 Apr 2011 19:05:22 +0300 Message-ID: <1302105922.2865.11.camel@stimpy> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm To: Pekka Enberg Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:38161 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752321Ab1DFQFc (ORCPT ); Wed, 6 Apr 2011 12:05:32 -0400 Received: by wya21 with SMTP id 21so1434323wya.19 for ; Wed, 06 Apr 2011 09:05:31 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: Following patch adds more cleanup code when exiting. Close disk image, free msrs array and destroy the timer fd. Signed-off-by: Justin P. Mattock --- tools/kvm/include/kvm/kvm.h | 1 + tools/kvm/kvm.c | 14 ++++++++++++++ tools/kvm/main.c | 4 +++- 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h index a1af42f..a099307 100644 --- a/tools/kvm/include/kvm/kvm.h +++ b/tools/kvm/include/kvm/kvm.h @@ -43,6 +43,7 @@ bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, void kvm__reset_vcpu(struct kvm *self); void kvm__setup_bios(struct kvm *self); void kvm__start_timer(struct kvm *self); +void kvm__stop_timer(struct kvm *self); void kvm__run(struct kvm *self); void kvm__irq_line(struct kvm *self, int irq, int level); bool kvm__emulate_io(struct kvm *self, uint16_t port, void *data, int direction, int size, uint32_t count); diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index 5067b8b..cdc1394 100644 --- a/tools/kvm/kvm.c +++ b/tools/kvm/kvm.c @@ -105,6 +105,11 @@ static struct kvm *kvm__new(void) void kvm__delete(struct kvm *self) { + kvm__stop_timer(self); + + if (self->msrs) + free(self->msrs); + free(self->ram_start); free(self); } @@ -612,6 +617,15 @@ void kvm__start_timer(struct kvm *self) die("timer_settime()"); } +void kvm__stop_timer(struct kvm *self) +{ + if (self->timerid) + if(timer_delete(self->timerid) < 0) + die("timer_delete()"); + + self->timerid = 0; +} + void kvm__run(struct kvm *self) { int err; diff --git a/tools/kvm/main.c b/tools/kvm/main.c index 1eeb311..d9c5321 100644 --- a/tools/kvm/main.c +++ b/tools/kvm/main.c @@ -220,7 +220,8 @@ int main(int argc, char *argv[]) } } exit_kvm: - kvm__delete(kvm); + disk_image__close(kvm->disk_image); + kvm__delete(kvm); return 0; @@ -230,6 +231,7 @@ panic_kvm: if (kvm->kvm_run->exit_reason == KVM_EXIT_UNKNOWN) fprintf(stderr, "KVM exit code: 0x%" PRIu64 "\n", kvm->kvm_run->hw.hardware_exit_reason); + disk_image__close(kvm->disk_image); kvm__show_registers(kvm); kvm__show_code(kvm); kvm__show_page_tables(kvm);