Commit 06ec79e8 authored by Bharata B Rao's avatar Bharata B Rao Committed by David Gibson
Browse files

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: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent c8a98293

hw/ppc/spapr.c

+9 −4
Original line number Diff line number Diff line
@@ -1227,16 +1227,21 @@ static int spapr_hpt_shift_for_ramsize(uint64_t ramsize) 
    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,

                                 Error **errp)

{

    long rc;



    /* Clean up any HPT info from a previous boot */

    g_free(spapr->htab);

    spapr->htab = NULL;

    spapr->htab_shift = 0;

    close_htab_fd(spapr);

    spapr_free_hpt(spapr);



    rc = kvmppc_reset_htab(shift);

    if (rc < 0) {

hw/ppc/spapr_hcall.c

+1 −4
Original line number Diff line number Diff line
@@ -913,10 +913,7 @@ static void spapr_check_setup_free_hpt(sPAPRMachineState *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 = NULL;

        spapr->htab_shift = 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);

include/hw/ppc/spapr.h

+1 −0
Original line number Diff line number Diff line
@@ -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,