From patchwork Tue Feb 9 02:41:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 77922 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o192emdH024895 for ; Tue, 9 Feb 2010 02:40:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532Ab0BICkq (ORCPT ); Mon, 8 Feb 2010 21:40:46 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:50547 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab0BICkp (ORCPT ); Mon, 8 Feb 2010 21:40:45 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6EE10170028; Tue, 9 Feb 2010 10:40:44 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o192e0Dn007745; Tue, 9 Feb 2010 10:40:00 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id A38FAD47CB; Tue, 9 Feb 2010 10:42:14 +0800 (CST) Message-ID: <4B70CB74.1060308@cn.fujitsu.com> Date: Tue, 09 Feb 2010 10:41:56 +0800 From: Wei Yongjun User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: kvm@vger.kernel.org CC: Marcelo Tosatti Subject: [PATCH 4/4] KVM: ia64: destroy ioapic device if fail to setup default irq routing References: <4B70C8ED.4000205@cn.fujitsu.com> <4B70C95F.7070508@cn.fujitsu.com> <4B70CADF.7070204@cn.fujitsu.com> In-Reply-To: <4B70CADF.7070204@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Feb 2010 02:40:48 +0000 (UTC) diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 0618898..26e0e08 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -968,7 +968,7 @@ long kvm_arch_vm_ioctl(struct file *filp, goto out; r = kvm_setup_default_irq_routing(kvm); if (r) { - kfree(kvm->arch.vioapic); + kvm_ioapic_destroy(kvm); goto out; } break;