From patchwork Mon Feb 8 09:56:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 77693 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 o189tdfY013419 for ; Mon, 8 Feb 2010 09:55:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753466Ab0BHJzh (ORCPT ); Mon, 8 Feb 2010 04:55:37 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:58621 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751607Ab0BHJzh (ORCPT ); Mon, 8 Feb 2010 04:55:37 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id EC1BA17008E; Mon, 8 Feb 2010 17:55:35 +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 o189sqBa026372; Mon, 8 Feb 2010 17:54:52 +0800 Received: from [10.167.141.76] (unknown [10.167.141.76]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 38579D47CB; Mon, 8 Feb 2010 17:57:05 +0800 (CST) Message-ID: <4B6FDFDC.40603@cn.fujitsu.com> Date: Mon, 08 Feb 2010 17:56:44 +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] KVM: ia64: clear kvm->arch.vioapic if fail to create irq chip References: <4B6FD2DB.9040104@cn.fujitsu.com> <4B6FD377.205@cn.fujitsu.com> <4B6FDB2D.9080707@cn.fujitsu.com> In-Reply-To: <4B6FDB2D.9080707@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]); Mon, 08 Feb 2010 09:55:39 +0000 (UTC) diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 0618898..0cfc15d 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -969,6 +969,7 @@ long kvm_arch_vm_ioctl(struct file *filp, r = kvm_setup_default_irq_routing(kvm); if (r) { kfree(kvm->arch.vioapic); + kvm->arch.vioapic = NULL; goto out; } break;