From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Subject: [PATCH 3/4] KVM: PIT: unregister kvm irq notifier if fail to create pit Date: Tue, 09 Feb 2010 10:39:27 +0800 Message-ID: <4B70CADF.7070204@cn.fujitsu.com> References: <4B70C8ED.4000205@cn.fujitsu.com> <4B70C95F.7070508@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:59142 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab0BICiQ (ORCPT ); Mon, 8 Feb 2010 21:38:16 -0500 In-Reply-To: <4B70C95F.7070508@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: If fail to create pit, we should unregister kvm irq notifier which register in kvm_create_pit(). Signed-off-by: Wei Yongjun Acked-by: Marcelo Tosatti --- arch/x86/kvm/i8254.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 6a74246..c9569f2 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -663,8 +663,9 @@ fail_unregister: kvm_io_bus_unregister_dev(kvm, KVM_PIO_BUS, &pit->dev); fail: - if (pit->irq_source_id >= 0) - kvm_free_irq_source_id(kvm, pit->irq_source_id); + kvm_unregister_irq_mask_notifier(kvm, 0, &pit->mask_notifier); + kvm_unregister_irq_ack_notifier(kvm, &pit_state->irq_ack_notifier); + kvm_free_irq_source_id(kvm, pit->irq_source_id); kfree(pit); return NULL; -- 1.6.3.3