From nobody Thu May 2 20:59:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494266556680143.64061560458185; Mon, 8 May 2017 11:02:36 -0700 (PDT) Received: from localhost ([::1]:60778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7mzS-00074V-EZ for importer@patchew.org; Mon, 08 May 2017 14:02:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7myF-0006Ih-LR for qemu-devel@nongnu.org; Mon, 08 May 2017 14:01:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7myA-0003vD-Rn for qemu-devel@nongnu.org; Mon, 08 May 2017 14:01:19 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:36037) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7myA-0003ux-L8; Mon, 08 May 2017 14:01:14 -0400 Received: by mail-wr0-x244.google.com with SMTP id v42so9744760wrc.3; Mon, 08 May 2017 11:01:14 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id s126sm1645874lja.43.2017.05.08.11.01.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 May 2017 11:01:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EK3UStvTbHb0GLOr/S0OVuh+3HqmJipnnHupQ2xoRHY=; b=hQ7hIFbhDTgYYxiCbifGw1xtnT/qa+e0r9yRPnBSOQTQWDd929aERa3Dr9B1klsIfc fXxYUol/zwpkD1c+QttU9fIjJKxcdLsUuwornV1ahcmUCxn/9DyJ7MBRSGPpNzY2tlKN zgpXF8G41o44P8OavYT/KRD72AM+Woo/Bqh2Rth7xYyNZgOzyA+5D8j/losUvg4h514L jfmlFUhioAunax7+NlTR9c2EdPXNooZPlAYUVSzefGrRGd/bR1CsZUN5k85K99DvLbmX i0eydjXyWDA5qxuenbylc2q3PwR3My/OR/0XsFgShfjQJCS1ROVlUE6tPyTO5Wc6TIHT 7Elw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EK3UStvTbHb0GLOr/S0OVuh+3HqmJipnnHupQ2xoRHY=; b=l6EGwS0CAUFwbvGa5Vv4cjg2yI2rNOXlS1qkF0eE58sNN3AHYU9UxIaCKuDbwr+shk t7kMIrrdGtyVSpPJ6jaQNBC0xqrZX3KmBIMG+T6G4TLAyQ1qnKv1C5aN85jc2vOQG6p4 VnHxuNJxAO2Dk9DUk+56zhkLkS7AcX/Aqk7ph1ocz2W3x9RBtm64h8ynmIboMR0qyhq3 opnId1UWiKZvzvRSwXwi+U67Rrw1UEHZQm/pDK1p258Mg0hgq27ndZdGJ48gbYL6ffUF BHlgMM1Lpkg5e5p22cAfZ3Qg5VP/moxVY/xgeYEkkiTcftZeONP0YPaiv8IbzgmarF8Z BNlA== X-Gm-Message-State: AODbwcAsW7hacGWqSoiDINAgNc4y1vA39h+u1RSvSb2c0kUuXldE6jdJ C7ZK/jVbmTED8A== X-Received: by 10.46.69.66 with SMTP id s63mr6851800lja.88.1494266473443; Mon, 08 May 2017 11:01:13 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Mon, 8 May 2017 11:00:56 -0700 Message-Id: <1494266456-2251-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH] hw/xtensa: sim: use g_string/g_new X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU Trivial , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Replace malloc/free/sprintf with g_string/g_string_printf/g_string_free. Replace g_malloc with g_new when allocating the MemoryRegion to get more type safety. Suggested-by: Alex Benn=C3=A9e Signed-off-by: Max Filippov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/xtensa/sim.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index d2d1d3a..b27e28d 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -41,21 +41,21 @@ static void xtensa_create_memory_regions(const XtensaMe= mory *memory, const char *name) { unsigned i; - char *num_name =3D malloc(strlen(name) + sizeof(i) * 3 + 1); + GString *num_name =3D g_string_new(NULL); =20 for (i =3D 0; i < memory->num; ++i) { MemoryRegion *m; =20 - sprintf(num_name, "%s%u", name, i); - m =3D g_malloc(sizeof(*m)); - memory_region_init_ram(m, NULL, num_name, + g_string_printf(num_name, "%s%u", name, i); + m =3D g_new(MemoryRegion, 1); + memory_region_init_ram(m, NULL, num_name->str, memory->location[i].size, &error_fatal); vmstate_register_ram_global(m); memory_region_add_subregion(get_system_memory(), memory->location[i].addr, m); } - free(num_name); + g_string_free(num_name, true); } =20 static uint64_t translate_phys_addr(void *opaque, uint64_t addr) --=20 2.1.4