diff options
| author | Bharata B Rao <bharata@linux.vnet.ibm.com> | 2017-05-17 09:19:20 +0530 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-05-24 11:39:52 +1000 |
| commit | 06ec79e865a4a496e762a83126d00d0ed39205f5 (patch) | |
| tree | 8707d7689dcf67b226f44d5b9fe8557e38798bb7 /hw/ppc/spapr.c | |
| parent | c8a98293f7fe672fc3b7a3caafede701fbb3180e (diff) | |
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>
Diffstat (limited to 'hw/ppc/spapr.c')
| -rw-r--r-- | hw/ppc/spapr.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a9471b99f5..35dceb024e 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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) { |