From nobody Tue Feb 10 17:31:17 2026 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 149568456958170.16692208699374; Wed, 24 May 2017 20:56:09 -0700 (PDT) Received: from localhost ([::1]:58001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDjse-0002Ow-6r for importer@patchew.org; Wed, 24 May 2017 23:56:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDjoP-0006Ut-QD for qemu-devel@nongnu.org; Wed, 24 May 2017 23:51:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDjoO-0007TW-Fk for qemu-devel@nongnu.org; Wed, 24 May 2017 23:51:45 -0400 Received: from ozlabs.org ([103.22.144.67]:52041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dDjoO-0007SJ-3H; Wed, 24 May 2017 23:51:44 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3wYFgY13Rfz9sNC; Thu, 25 May 2017 13:51:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1495684297; bh=38e1NDrDt1B3IjRZ2t4huH/6CEUZVRdmuoeMOuG0o3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FPrs1njnh73KxtZUdcB4Ml98NVIK7Oiekp/7e89BsfBgQYFz1hQjmzy2U3w3K9gAU PVp7/eKOe3yjyuGMdy1Rr5Yj+2cdBaWmb3llbuXxPzP4Y5hZ92sS3X03yFyOtkyTRF wxJSd/NpMKvWr0/Ej0rUWJzwN1PnvNczdTzDGWMw= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 25 May 2017 13:51:19 +1000 Message-Id: <20170525035132.24268-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170525035132.24268-1-david@gibson.dropbear.id.au> References: <20170525035132.24268-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 05/18] spapr: Consolidate HPT freeing code into a routine 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-devel@nongnu.org, aik@ozlabs.ru, sursingh@redhat.com, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Bharata B Rao , sbobroff@redhat.com, David Gibson 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 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Bharata B Rao Consolidate the code that frees HPT into a separate routine spapr_free_hpt() as the same chunk of code is called from two places. Signed-off-by: Bharata B Rao Signed-off-by: David Gibson --- hw/ppc/spapr.c | 13 +++++++++---- hw/ppc/spapr_hcall.c | 5 +---- include/hw/ppc/spapr.h | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a9471b9..35dceb0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1227,16 +1227,21 @@ static int spapr_hpt_shift_for_ramsize(uint64_t ram= size) return shift; } =20 +void spapr_free_hpt(sPAPRMachineState *spapr) +{ + g_free(spapr->htab); + spapr->htab =3D NULL; + spapr->htab_shift =3D 0; + close_htab_fd(spapr); +} + static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, Error **errp) { long rc; =20 /* Clean up any HPT info from a previous boot */ - g_free(spapr->htab); - spapr->htab =3D NULL; - spapr->htab_shift =3D 0; - close_htab_fd(spapr); + spapr_free_hpt(spapr); =20 rc =3D kvmppc_reset_htab(shift); if (rc < 0) { diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d608d6..2daace4 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -913,10 +913,7 @@ static void spapr_check_setup_free_hpt(sPAPRMachineSta= te *spapr, /* We assume RADIX, so this catches all the "Do Nothing" cases */ } else if (!(patbe_old & PATBE1_GR)) { /* HASH->RADIX : Free HPT */ - g_free(spapr->htab); - spapr->htab =3D NULL; - spapr->htab_shift =3D 0; - close_htab_fd(spapr); + spapr_free_hpt(spapr); } else if (!(patbe_new & PATBE1_GR)) { /* RADIX->HASH || NOTHING->HASH : Allocate HPT */ spapr_setup_hpt_and_vrma(spapr); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 5802f88..93c4cfc 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -610,6 +610,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *sm, sPAPROptionVector *ov5_updates); void close_htab_fd(sPAPRMachineState *spapr); void spapr_setup_hpt_and_vrma(sPAPRMachineState *spapr); +void spapr_free_hpt(sPAPRMachineState *spapr); sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn); void spapr_tce_table_enable(sPAPRTCETable *tcet, uint32_t page_shift, uint64_t bus_offset, --=20 2.9.4