From patchwork Thu Nov 13 15:04:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 5298471 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB076C11AC for ; Thu, 13 Nov 2014 15:11:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A2552020E for ; Thu, 13 Nov 2014 15:11:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 474AE2021B for ; Thu, 13 Nov 2014 15:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933168AbaKMPLj (ORCPT ); Thu, 13 Nov 2014 10:11:39 -0500 Received: from mail-pd0-f179.google.com ([209.85.192.179]:35197 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753930AbaKMPEG (ORCPT ); Thu, 13 Nov 2014 10:04:06 -0500 Received: by mail-pd0-f179.google.com with SMTP id g10so14747649pdj.38 for ; Thu, 13 Nov 2014 07:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=mdtJC1r1o0FspWywBLH0jesUwqtw6HBLnccWI+1mUK4=; b=x70hTbAHt5uQDJkAmWFreboqOtFpRiScZqsQ4NVuXR1rHKoTOIS0cr6DtSnSj3R+/E TYOdjThXMfWwlIlgVQtnl+9roOZSYtg3gpJ0Xu6OxCO6QaGASMb7bnmcxmCdxeWPyjqn Tj7+Ctkay8EEKyCanKx0ME2t56i9J/Gr8wH5xMyDj0X1SMixk8sBpPpEkXzb30Tp/uCi BgoUVwd5yLKLdyh91lTjoOrm7HPyWQuh/ua1L3gHyOWbyI08osUJ69sSc47rc/1pqNHF Tls0AsFr23GNInr7yLajuQOAYPCBc2qBSRFWNHl4Gl9HcuHo75FD5PU1/fLTeCYNXNGO KFwg== X-Received: by 10.66.100.136 with SMTP id ey8mr3141658pab.93.1415891046373; Thu, 13 Nov 2014 07:04:06 -0800 (PST) Received: from [192.168.1.104] ([223.72.65.16]) by mx.google.com with ESMTPSA id n2sm25207313pdg.2.2014.11.13.07.04.02 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Nov 2014 07:04:05 -0800 (PST) Message-ID: <5464C865.90504@gmail.com> Date: Thu, 13 Nov 2014 23:04:05 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: christoffer.dall@linaro.org, marc.zyngier@arm.com, gleb@kernel.org, Paolo Bonzini CC: "linux-arm-kernel@lists.infradead.org" , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, "linux-kernel@vger.kernel.org" Subject: [PATCH] virt: kvm: arm: vgic: Process the failure case when kvm_register_device_ops() fails Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When kvm_register_device_ops() fails, also need call free_percpu_irq() just like others have down within kvm_vgic_hyp_init(). Signed-off-by: Chen Gang --- virt/kvm/arm/vgic.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 3aaca49..b799f17 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -2470,8 +2470,14 @@ int kvm_vgic_hyp_init(void) on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1); - return kvm_register_device_ops(&kvm_arm_vgic_v2_ops, - KVM_DEV_TYPE_ARM_VGIC_V2); + ret = kvm_register_device_ops(&kvm_arm_vgic_v2_ops, + KVM_DEV_TYPE_ARM_VGIC_V2); + if (ret) { + kvm_err("Cannot register device ops\n"); + goto out_free_irq; + } + + return 0; out_free_irq: free_percpu_irq(vgic->maint_irq, kvm_get_running_vcpus());