[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH v1 4/6] spapr: Consolidate HPT freeing code
From: |
David Gibson |
Subject: |
Re: [Qemu-devel] [RFC PATCH v1 4/6] spapr: Consolidate HPT freeing code into a routine |
Date: |
Wed, 17 May 2017 16:55:43 +1000 |
User-agent: |
Mutt/1.8.0 (2017-02-23) |
On Wed, May 17, 2017 at 09:19:20AM +0530, Bharata B Rao wrote:
> 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 <address@hidden>
Applied to ppc-for-2.10. This is a good clean up in its own right.
Plus it will be useful to me to get my HPT resizing patches integrated
with radix support.
> ---
> 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 1b7cada..521eef1 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -1222,16 +1222,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) {
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 3600b0e..be79e3d 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -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);
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index a692e63..6f9cb85 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,
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature