From nobody Sun Apr 28 16:27:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1563265529; cv=none; d=zoho.com; s=zohoarc; b=Z5B3hnOc2Pa2+fzepPiALR/jyIcpcrVDoV5rHdHrQP7zYSCZm/AfOMRhjBKRdP7/FvfJC5GgTKyMKTzlJYdG/7VvTVFdyhqy0uDiiErla6JxR7H+zSGjsF39pewm7fzUs2+6tW8Jm1PeMM0LFquGAAyMcDfcWA3kO76WnWpLN3M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563265529; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=HGxO2I5HgnSDsONKN2o4CVYeYAr/MBwM+E1hnbX/7+g=; b=G2T6ogNbtwATksxCK/OIj9KA4E4uO5MPXfduXF3BYkwGdmaQV+5XHsD0sJImo1Rs7MhbvPK3kW7No0VyGWrxB0PKJebMsG9pJPGb50o1ZgyNw2kvnnxWlJ9w8uNfXsWs4X8T6iRad7/w+mfR9hhYgC770nx3DrR7bR7kBjCoT0c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563265529770819.1013471094973; Tue, 16 Jul 2019 01:25:29 -0700 (PDT) Received: from localhost ([::1]:46320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIm1-0005FV-4a for importer@patchew.org; Tue, 16 Jul 2019 04:25:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36559) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnIln-0004lH-2e for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnIll-0005zL-TY for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:25:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:47144 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hnIll-0005yl-Ny for qemu-devel@nongnu.org; Tue, 16 Jul 2019 04:25:05 -0400 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6G8LrU1050096 for ; Tue, 16 Jul 2019 04:25:04 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ts9a5mbp1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 16 Jul 2019 04:25:04 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 16 Jul 2019 09:25:02 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 16 Jul 2019 09:25:00 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x6G8Oxs433292358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Jul 2019 08:24:59 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 191F14C044; Tue, 16 Jul 2019 08:24:59 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8BF144C046; Tue, 16 Jul 2019 08:24:58 +0000 (GMT) Received: from lep8c.aus.stglabs.ibm.com (unknown [9.40.192.207]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 16 Jul 2019 08:24:58 +0000 (GMT) From: Shivaprasad G Bhat To: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Date: Tue, 16 Jul 2019 03:24:57 -0500 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19071608-4275-0000-0000-0000034D5EAD X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19071608-4276-0000-0000-0000385D6FCA Message-Id: <156326547324.51324.17260886524634041718.stgit@lep8c.aus.stglabs.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-07-16_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907160107 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH] ppc: Fix some memory leaks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" valgrind showed some memory leaks while running qemu-system-ppc64. Fixing them in this patch. Signed-off-by: Shivaprasad G Bhat --- hw/ppc/spapr_caps.c | 2 ++ hw/ppc/spapr_drc.c | 5 ++++- hw/ppc/spapr_hcall.c | 2 ++ target/ppc/kvm.c | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c index bbb001f84a..8e3350f777 100644 --- a/hw/ppc/spapr_caps.c +++ b/hw/ppc/spapr_caps.c @@ -786,11 +786,13 @@ void spapr_caps_add_properties(SpaprMachineClass *smc= , Error **errp) NULL, cap, &local_err); if (local_err) { error_propagate(errp, local_err); + g_free((char *)name); return; } =20 desc =3D g_strdup_printf("%s", cap->description); object_class_property_set_description(klass, name, desc, &local_er= r); + g_free((char *)name); g_free(desc); if (local_err) { error_propagate(errp, local_err); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index bacadfcac5..37fbfe6900 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -827,6 +827,7 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner, = uint32_t drc_type_mask) Object *obj; SpaprDrc *drc; SpaprDrcClass *drck; + const char *drc_name =3D NULL; uint32_t drc_index, drc_power_domain; =20 if (!strstart(prop->type, "link<", NULL)) { @@ -856,8 +857,10 @@ int spapr_dt_drc(void *fdt, int offset, Object *owner,= uint32_t drc_type_mask) g_array_append_val(drc_power_domains, drc_power_domain); =20 /* ibm,drc-names */ - drc_names =3D g_string_append(drc_names, spapr_drc_name(drc)); + drc_name =3D spapr_drc_name(drc); + drc_names =3D g_string_append(drc_names, drc_name); drc_names =3D g_string_insert_len(drc_names, -1, "\0", 1); + g_free((char *)drc_name); =20 /* ibm,drc-types */ drc_types =3D g_string_append(drc_types, drck->typename); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 6808d4cda8..0fc58156a0 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1612,6 +1612,7 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, ov5_updates =3D spapr_ovec_new(); spapr->cas_reboot =3D spapr_ovec_diff(ov5_updates, ov5_cas_old, spapr->ov5_cas); + spapr_ovec_cleanup(ov5_cas_old); /* Now that processing is finished, set the radix/hash bit for the * guest if it requested a valid mode; otherwise terminate the boot. */ if (guest_radix) { @@ -1640,6 +1641,7 @@ static target_ulong h_client_architecture_support(Pow= erPCCPU *cpu, (spapr_h_cas_compose_response(spapr, args[1], args[2], ov5_updates) !=3D 0); } + spapr_ovec_cleanup(ov1_guest); =20 /* * Ensure the guest asks for an interrupt mode we support; otherwise diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 8a06d3171e..498ca6d53b 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -491,7 +491,8 @@ int kvm_arch_init_vcpu(CPUState *cs) return ret; } =20 - idle_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, kvm_kick_cpu, cpu); + if (!idle_timer) + idle_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, kvm_kick_cpu, cpu); =20 switch (cenv->mmu_model) { case POWERPC_MMU_BOOKE206: