From patchwork Mon Oct 17 10:03:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ray Wang X-Patchwork-Id: 120137 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 4BBE7B6FA2 for ; Mon, 17 Oct 2011 21:05:31 +1100 (EST) Received: from localhost ([::1]:59975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFk4R-0005W5-Ve for incoming@patchwork.ozlabs.org; Mon, 17 Oct 2011 06:05:23 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFk4M-0005Vs-Bv for qemu-devel@nongnu.org; Mon, 17 Oct 2011 06:05:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RFk4L-0003io-7S for qemu-devel@nongnu.org; Mon, 17 Oct 2011 06:05:18 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:59776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RFk4K-0003iW-E4; Mon, 17 Oct 2011 06:05:16 -0400 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) by e23smtp07.au.ibm.com (8.14.4/8.13.1) with ESMTP id p9HA57rJ018760; Mon, 17 Oct 2011 21:05:07 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9HA2Y192248886; Mon, 17 Oct 2011 21:02:36 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9HA54gr018683; Mon, 17 Oct 2011 21:05:04 +1100 Received: from Ray-Ubuntu-11.cn.ibm.com ([9.115.116.13]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9HA53kb016905; Mon, 17 Oct 2011 21:05:03 +1100 From: Ray Wang To: qemu-devel@nongnu.org Date: Mon, 17 Oct 2011 18:03:56 +0800 Message-Id: <1318845836-30088-1-git-send-email-raywang@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.81.31.140 Cc: qemu-trivial@nongnu.org, raywang@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] change free() to g_free() to pair with g_malloc() series. 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: Ray Wang --- block/dmg.c | 14 +++++++------- target-arm/helper.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index 64c3cce..661f31b 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -284,14 +284,14 @@ static void dmg_close(BlockDriverState *bs) { BDRVDMGState *s = bs->opaque; if(s->n_chunks>0) { - free(s->types); - free(s->offsets); - free(s->lengths); - free(s->sectors); - free(s->sectorcounts); + g_free(s->types); + g_free(s->offsets); + g_free(s->lengths); + g_free(s->sectors); + g_free(s->sectorcounts); } - free(s->compressed_chunk); - free(s->uncompressed_chunk); + g_free(s->compressed_chunk); + g_free(s->uncompressed_chunk); inflateEnd(&s->zstream); } diff --git a/target-arm/helper.c b/target-arm/helper.c index e2428eb..2b17dc9 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -471,7 +471,7 @@ static uint32_t cpu_arm_find_by_name(const char *name) void cpu_arm_close(CPUARMState *env) { - free(env); + g_free(env); } uint32_t cpsr_read(CPUARMState *env)