From patchwork Thu Feb 24 21:56:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 588571 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 p1OLuQ4J029606 for ; Thu, 24 Feb 2011 21:57:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753899Ab1BXV4Z (ORCPT ); Thu, 24 Feb 2011 16:56:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10084 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752989Ab1BXV4Y (ORCPT ); Thu, 24 Feb 2011 16:56:24 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p1OLuOS2022738 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Feb 2011 16:56:24 -0500 Received: from trasno.mitica (ovpn-113-97.phx2.redhat.com [10.3.113.97]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p1OLuKcw010922; Thu, 24 Feb 2011 16:56:23 -0500 From: Juan Quintela To: kvm@vger.kernel.org Cc: alex.williamson@redhat.com Subject: [PATCH 1/3] device-assignment: Use qemu_mallocz() instead of calloc() Date: Thu, 24 Feb 2011 22:56:18 +0100 Message-Id: <95f8ab53e5fec7ff2de9e11dbf41aea24142d597.1298584362.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 24 Feb 2011 21:57:55 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index e5205cf..115df19 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1106,11 +1106,7 @@ static void assigned_dev_update_msi(PCIDevice *pci_dev, unsigned int ctrl_pos) if (ctrl_byte & PCI_MSI_FLAGS_ENABLE) { int pos = ctrl_pos - PCI_MSI_FLAGS; - assigned_dev->entry = calloc(1, sizeof(struct kvm_irq_routing_entry)); - if (!assigned_dev->entry) { - perror("assigned_dev_update_msi: "); - return; - } + assigned_dev->entry = qemu_mallocz(sizeof(*(assigned_dev->entry))); assigned_dev->entry->u.msi.address_lo = pci_get_long(pci_dev->config + pos + PCI_MSI_ADDRESS_LO); assigned_dev->entry->u.msi.address_hi = 0; @@ -1188,11 +1184,7 @@ static int assigned_dev_update_msix_mmio(PCIDevice *pci_dev) free_dev_irq_entries(adev); adev->irq_entries_nr = entries_nr; - adev->entry = calloc(entries_nr, sizeof(struct kvm_irq_routing_entry)); - if (!adev->entry) { - perror("assigned_dev_update_msix_mmio: "); - return -errno; - } + adev->entry = qemu_mallocz(entries_nr * sizeof(*(adev->entry))); msix_entry.assigned_dev_id = msix_nr.assigned_dev_id; entries_nr = 0;