ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: Consolidate HPT freeing code into a routine 

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 <bharata@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Bharata B Rao 2017-05-17 09:19:20 +05:30 committed by David Gibson
parent c8a98293f7
commit 06ec79e865
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/ppc/spapr.c
View File

@ -1227,16 +1227,21 @@ static int spapr_hpt_shift_for_ramsize(uint64_t ramsize)
return shift; return shift;
} }
void spapr_free_hpt(sPAPRMachineState *spapr)
{
g_free(spapr->htab);
spapr->htab = NULL;
spapr->htab_shift = 0;
close_htab_fd(spapr);
}
static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift,
Error **errp) Error **errp)
{ {
long rc; long rc;
/* Clean up any HPT info from a previous boot */ /* Clean up any HPT info from a previous boot */
g_free(spapr->htab); spapr_free_hpt(spapr);
spapr->htab = NULL;
spapr->htab_shift = 0;
close_htab_fd(spapr);
rc = kvmppc_reset_htab(shift); rc = kvmppc_reset_htab(shift);
if (rc < 0) { if (rc < 0) {

5
hw/ppc/spapr_hcall.c
View File

@ -913,10 +913,7 @@ static void spapr_check_setup_free_hpt(sPAPRMachineState *spapr,
/* We assume RADIX, so this catches all the "Do Nothing" cases */ /* We assume RADIX, so this catches all the "Do Nothing" cases */
} else if (!(patbe_old & PATBE1_GR)) { } else if (!(patbe_old & PATBE1_GR)) {
/* HASH->RADIX : Free HPT */ /* HASH->RADIX : Free HPT */
g_free(spapr->htab); spapr_free_hpt(spapr);
spapr->htab = NULL;
spapr->htab_shift = 0;
close_htab_fd(spapr);
} else if (!(patbe_new & PATBE1_GR)) { } else if (!(patbe_new & PATBE1_GR)) {
/* RADIX->HASH || NOTHING->HASH : Allocate HPT */ /* RADIX->HASH || NOTHING->HASH : Allocate HPT */
spapr_setup_hpt_and_vrma(spapr); spapr_setup_hpt_and_vrma(spapr);

1
include/hw/ppc/spapr.h
View File

@ -610,6 +610,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *sm,
sPAPROptionVector *ov5_updates); sPAPROptionVector *ov5_updates);
void close_htab_fd(sPAPRMachineState *spapr); void close_htab_fd(sPAPRMachineState *spapr);
void spapr_setup_hpt_and_vrma(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); sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn);
void spapr_tce_table_enable(sPAPRTCETable *tcet, void spapr_tce_table_enable(sPAPRTCETable *tcet,
uint32_t page_shift, uint64_t bus_offset, uint32_t page_shift, uint64_t bus_offset,