From patchwork Thu Nov 25 00:28:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 354992 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAP0TII8004982 for ; Thu, 25 Nov 2010 00:29:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755547Ab0KYA3I (ORCPT ); Wed, 24 Nov 2010 19:29:08 -0500 Received: from mail-ew0-f46.google.com ([209.85.215.46]:49463 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754638Ab0KYA3H (ORCPT ); Wed, 24 Nov 2010 19:29:07 -0500 Received: by ewy5 with SMTP id 5so192338ewy.19 for ; Wed, 24 Nov 2010 16:29:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=Au09xrbRq0GsLSxEpY+D3RLcn8FPOLfawTSoXckM07s=; b=DbXlvvqZsw8Y3xV9XxwEzi99q4pknW3cHYhrNxrL4PaKNoefRVH6sabou3cYgnlt1y dQX1GKpl7Ch9IWjiDVW1UuyzUq7wpwmBo64/nTe7eaSxPVjJiv95yYIhnYjFxEkpel6z 8VhK37lEOH2sq6AFKHtvNgrlX1Ldgn2Dpe9zs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=wACWOAqZq7op6DGln8HPhCd8ixWABU9/vK5oofmiew+EFyoGXOEMPI+Fcj/jKs3HRj wVp2UH9WN8LecnszXO+ZQX2CLIjS+q9dc6p8HJ57U+or7Sei9cIBMPufXiu38bsQ1VhB I2lQ6jJneHNVtYapVLyg0dRCGj1CDHYMjYxwc= Received: by 10.216.166.66 with SMTP id f44mr3261078wel.37.1290644943684; Wed, 24 Nov 2010 16:29:03 -0800 (PST) Received: from [192.168.1.39] (15.Red-79-151-187.dynamicIP.rima-tde.net [79.151.187.15]) by mx.google.com with ESMTPS id x15sm42753weq.31.2010.11.24.16.28.58 (version=SSLv3 cipher=RC4-MD5); Wed, 24 Nov 2010 16:29:02 -0800 (PST) Subject: [PATCH] virt: kvm: coding style cleanups From: Javier Martinez Canillas To: Avi Kivity , Marcelo Tosatti , kvm@vger.kernel.org, kernel-janitors@vger.kernel.org Date: Thu, 25 Nov 2010 01:28:57 +0100 Message-ID: <1290644937.6078.9.camel@javier-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 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 (demeter1.kernel.org [140.211.167.41]); Thu, 25 Nov 2010 00:29:19 +0000 (UTC) diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index ae72ae6..c9dd690 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -620,7 +620,7 @@ static int kvm_vm_ioctl_set_msix_nr(struct kvm *kvm, goto msix_nr_out; } adev->guest_msix_entries = - kzalloc(sizeof(struct msix_entry) * entry_nr->entry_nr, + kzalloc(sizeof(struct msix_entry) *entry_nr->entry_nr, GFP_KERNEL); if (!adev->guest_msix_entries) { kfree(adev->host_msix_entries); @@ -750,7 +750,7 @@ long kvm_vm_ioctl_assigned_device(struct kvm *kvm, unsigned ioctl, goto out_free_irq_routing; r = kvm_set_irq_routing(kvm, entries, routing.nr, routing.flags); - out_free_irq_routing: +out_free_irq_routing: vfree(entries); break; }