From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Subject: [PATCHv2] KVM: kvm->arch.vioapic should be NULL if kvm_ioapic_init() failure Date: Tue, 09 Feb 2010 09:18:03 +0800 Message-ID: <4B70B7CB.8070209@cn.fujitsu.com> References: <4B6FD2DB.9040104@cn.fujitsu.com> <4B6FD377.205@cn.fujitsu.com> <4B6FDB2D.9080707@cn.fujitsu.com> <20100208180754.GC5415@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: Marcelo Tosatti Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:60995 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751763Ab0BIBQw (ORCPT ); Mon, 8 Feb 2010 20:16:52 -0500 In-Reply-To: <20100208180754.GC5415@amt.cnet> Sender: kvm-owner@vger.kernel.org List-ID: kvm->arch.vioapic should be NULL in case of kvm_ioapic_init() failure due to cannot register io dev. Signed-off-by: Wei Yongjun --- virt/kvm/ioapic.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index a2edfd1..f3d0693 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -393,8 +393,10 @@ int kvm_ioapic_init(struct kvm *kvm) mutex_lock(&kvm->slots_lock); ret = kvm_io_bus_register_dev(kvm, KVM_MMIO_BUS, &ioapic->dev); mutex_unlock(&kvm->slots_lock); - if (ret < 0) + if (ret < 0) { + kvm->arch.vioapic = NULL; kfree(ioapic); + } return ret; } -- 1.6.3.3