From patchwork Mon Oct 17 09:28:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 120174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 13493B6F99 for ; Mon, 17 Oct 2011 22:29:48 +1100 (EST) Received: from localhost ([::1]:52236 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjW2-0008Cl-2q for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 05:29:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:32977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUn-0005FL-CX for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFjUj-0004Jz-En for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:33 -0400 Received: from goliath.siemens.de ([192.35.17.28]:16048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFjUi-0004Im-Ux for qemu-devel@nongnu.org; Mon, 17 Oct 2011 05:28:29 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SR5N011846; Mon, 17 Oct 2011 11:28:27 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p9H9SKVg023511; Mon, 17 Oct 2011 11:28:27 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Mon, 17 Oct 2011 11:28:00 +0200 Message-Id: <9b016ce56a88f464b37b6bd14fef659a39e7110d.1318843693.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: Alex Williamson , qemu-devel@nongnu.org, kvm@vger.kernel.org, "Michael S. Tsirkin" Subject: [Qemu-devel] [RFC][PATCH 26/45] qemu-kvm: Use g_realloc for irq_routes extension X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Allows to drop checking for out-of-memory. Signed-off-by: Jan Kiszka --- qemu-kvm.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index 6bdd7b5..eb8f176 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -258,7 +258,6 @@ int kvm_add_routing_entry(struct kvm_irq_routing_entry *entry, { #ifdef KVM_CAP_IRQ_ROUTING KVMState *s = kvm_state; - struct kvm_irq_routing *z; struct kvm_irq_routing_entry *new; int n, size; @@ -269,12 +268,8 @@ int kvm_add_routing_entry(struct kvm_irq_routing_entry *entry, } size = sizeof(struct kvm_irq_routing); size += n * sizeof(*new); - z = realloc(s->irq_routes, size); - if (!z) { - return -ENOMEM; - } + s->irq_routes = g_realloc(s->irq_routes, size); s->nr_allocated_irq_routes = n; - s->irq_routes = z; s->msi_cache = g_realloc(s->msi_cache, sizeof(*s->msi_cache) * n); }