From patchwork Tue Sep 2 15:25:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 385188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B5DA014018A for ; Wed, 3 Sep 2014 01:29:23 +1000 (EST) Received: from localhost ([::1]:38823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOq1I-0002p2-JO for incoming@patchwork.ozlabs.org; Tue, 02 Sep 2014 11:29:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOpy6-0005MX-Gf for qemu-devel@nongnu.org; Tue, 02 Sep 2014 11:26:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOpy0-0000Yj-7D for qemu-devel@nongnu.org; Tue, 02 Sep 2014 11:26:02 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:64574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOpy0-0000YW-0m for qemu-devel@nongnu.org; Tue, 02 Sep 2014 11:25:56 -0400 Received: by mail-we0-f182.google.com with SMTP id w62so7134416wes.41 for ; Tue, 02 Sep 2014 08:25:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XijkqvlXJ146D8TY8IShgpR889PxzULBEU1jjm0d56k=; b=kBjkO8nNn3qIRlKIVwAvsA+KWzk7Fqy2GysA/rn5z1ezGGUWwB8OT3T+bOQjb0ZLKY rFSs7nz3jtWWz0Pmc8Ng2a9B9zNLTJvK2oRBTTIyLyT2k8YxvAO5bWcwjt0vsgoeHPMA yzkmwBWO52DR9H8MPSiJOVTnWKeS/h4QDb780kYBIMBKtmBMvU4DKMNhtsA9DZtxMsRD YNhaZqmN+o4a08AgBGdV5TB829gTX99w4cJIs/PKhsNYCR/ZEQEQJLt00rJBeQqMfLLx sl6U8o4BPhqge8ArD3bWGRpIQVgcHL5itbQNHup7EIrO32Zwn/u8SxsWzgykt8Wz6FZm PbfQ== X-Gm-Message-State: ALoCoQntDwCCW+cUpLr0Jekalu5rxgf+w66lUBvNOyzU9lg8vVznMe7598D/95rmEvG+wDW8k0dj X-Received: by 10.180.211.172 with SMTP id nd12mr28987946wic.74.1409671555230; Tue, 02 Sep 2014 08:25:55 -0700 (PDT) Received: from alcyon.dev.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id w2sm20969963wia.11.2014.09.02.08.25.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 08:25:54 -0700 (PDT) From: David Marchand To: qemu-devel@nongnu.org Date: Tue, 2 Sep 2014 17:25:27 +0200 Message-Id: <1409671532-12706-10-git-send-email-david.marchand@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1409671532-12706-1-git-send-email-david.marchand@6wind.com> References: <1409671532-12706-1-git-send-email-david.marchand@6wind.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.182 Cc: kvm@vger.kernel.org, stefanha@gmail.com, claudio.fontana@huawei.com, armbru@redhat.com, arei.gonglei@huawei.com, pbonzini@redhat.com, jani.kokkonen@huawei.com, cam@cs.ualberta.ca Subject: [Qemu-devel] [PATCH v4 09/14] contrib/ivshmem-*: switch to g_malloc0/g_free 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 Signed-off-by: David Marchand --- contrib/ivshmem-client/ivshmem-client.c | 9 ++------- contrib/ivshmem-server/ivshmem-server.c | 12 ++---------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/contrib/ivshmem-client/ivshmem-client.c b/contrib/ivshmem-client/ivshmem-client.c index 2ba40a7..a08f4d9 100644 --- a/contrib/ivshmem-client/ivshmem-client.c +++ b/contrib/ivshmem-client/ivshmem-client.c @@ -82,7 +82,7 @@ free_peer(IvshmemClient *client, IvshmemClientPeer *peer) close(peer->vectors[vector]); } - free(peer); + g_free(peer); } /* handle message coming from server (new peer, new vectors) */ @@ -116,12 +116,7 @@ handle_server_msg(IvshmemClient *client) /* new peer */ if (peer == NULL) { - peer = malloc(sizeof(*peer)); - if (peer == NULL) { - debug_log(client, "cannot allocate new peer\n"); - return -1; - } - memset(peer, 0, sizeof(*peer)); + peer = g_malloc0(sizeof(*peer)); peer->id = peer_id; peer->vectors_count = 0; QTAILQ_INSERT_TAIL(&client->peer_list, peer, next); diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c index e0d4d1d..15d468c 100644 --- a/contrib/ivshmem-server/ivshmem-server.c +++ b/contrib/ivshmem-server/ivshmem-server.c @@ -90,7 +90,7 @@ free_peer(IvshmemServer *server, IvshmemServerPeer *peer) close(peer->vectors[vector]); } - free(peer); + g_free(peer); } /* send the peer id and the shm_fd just after a new client connection */ @@ -138,15 +138,7 @@ handle_new_conn(IvshmemServer *server) debug_log(server, "accept()=%d\n", newfd); /* allocate new structure for this peer */ - peer = malloc(sizeof(*peer)); - if (peer == NULL) { - debug_log(server, "cannot allocate new peer\n"); - close(newfd); - return -1; - } - - /* initialize the peer struct, one eventfd per vector */ - memset(peer, 0, sizeof(*peer)); + peer = g_malloc0(sizeof(*peer)); peer->sock_fd = newfd; /* get an unused peer id */