From patchwork Mon Sep 28 10:38:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 7276601 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 653DE9F36A for ; Mon, 28 Sep 2015 10:43:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 969AB20781 for ; Mon, 28 Sep 2015 10:43:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B022320705 for ; Mon, 28 Sep 2015 10:43:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932971AbbI1KnP (ORCPT ); Mon, 28 Sep 2015 06:43:15 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:34208 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932700AbbI1KjU (ORCPT ); Mon, 28 Sep 2015 06:39:20 -0400 Received: by wicfx3 with SMTP id fx3so98019570wic.1; Mon, 28 Sep 2015 03:39:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=jl9NTogikJ1uoyC/c6aBW/e8z91cULGDqQpiCIuv8aQ=; b=zWeBl+pmqN6gOvvp+qfxPPtD915do+8gVHrfPzW8/caLKqdagtgr/U6fti+rDtLuP0 3cIPpsx2ipboWecEBRwxXJEQYx5ZdRJ+P0dvCbvYk9pycoSnGc6qPWoCOEZyDfJ2f4l0 uXWIqTbllQbsDPh8+WNGVKu4r7eMcywE4reTqIrDYyCkfwSmNpWlNDyrsSDy8exukZFE ukDPm96EWw0+UsXGqaLSo+t4HnSmsuEVvJKlCTCVfBqxLERGt4U/lc7t6sPGbMcdu6hl yJ3XfWcpC2aHNM+nwzbEyU88jRDjWnyc6Arg3Qc4nov1Il2NgHC1kb9d4GQVvsULsiUD 3UjA== X-Received: by 10.180.107.164 with SMTP id hd4mr18902465wib.94.1443436759180; Mon, 28 Sep 2015 03:39:19 -0700 (PDT) Received: from 640k.lan ([94.39.140.123]) by smtp.gmail.com with ESMTPSA id hx4sm17630753wjb.31.2015.09.28.03.39.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2015 03:39:18 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: bsd@redhat.com, Jason Wang , Gleb Natapov , "Michael S. Tsirkin" Subject: [FYI PATCH 10/20] kvm: use kmalloc() instead of kzalloc() during iodev register/unregister Date: Mon, 28 Sep 2015 12:38:55 +0200 Message-Id: <1443436745-38086-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1443436745-38086-1-git-send-email-pbonzini@redhat.com> References: <1443436745-38086-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 From: Jason Wang All fields of kvm_io_range were initialized or copied explicitly afterwards. So switch to use kmalloc(). Cc: Gleb Natapov Cc: Paolo Bonzini Cc: Michael S. Tsirkin Signed-off-by: Jason Wang Signed-off-by: Paolo Bonzini --- virt/kvm/kvm_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8db1d9361993..23116dcb2129 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -3341,7 +3341,7 @@ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, if (bus->dev_count - bus->ioeventfd_count > NR_IOBUS_DEVS - 1) return -ENOSPC; - new_bus = kzalloc(sizeof(*bus) + ((bus->dev_count + 1) * + new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count + 1) * sizeof(struct kvm_io_range)), GFP_KERNEL); if (!new_bus) return -ENOMEM; @@ -3373,7 +3373,7 @@ int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, if (r) return r; - new_bus = kzalloc(sizeof(*bus) + ((bus->dev_count - 1) * + new_bus = kmalloc(sizeof(*bus) + ((bus->dev_count - 1) * sizeof(struct kvm_io_range)), GFP_KERNEL); if (!new_bus) return -ENOMEM;