[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/3] spapr: move spapr_machine_using_legacy_numa() to spapr_n
From: |
David Gibson |
Subject: |
Re: [PATCH 1/3] spapr: move spapr_machine_using_legacy_numa() to spapr_numa.c |
Date: |
Fri, 29 Jan 2021 10:56:39 +1100 |
On Thu, Jan 28, 2021 at 12:17:29PM -0300, Daniel Henrique Barboza wrote:
> This function is used only in spapr_numa.c.
>
> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Applied to ppc-for-6.0, thanks.
> ---
> hw/ppc/spapr.c | 9 ---------
> hw/ppc/spapr_numa.c | 9 +++++++++
> include/hw/ppc/spapr.h | 1 -
> 3 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 6c47466fc2..2d60c6f594 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -295,15 +295,6 @@ static hwaddr spapr_node0_size(MachineState *machine)
> return machine->ram_size;
> }
>
> -bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr)
> -{
> - MachineState *machine = MACHINE(spapr);
> - SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
> -
> - return smc->pre_5_2_numa_associativity ||
> - machine->numa_state->num_nodes <= 1;
> -}
> -
> static void add_str(GString *s, const gchar *s1)
> {
> g_string_append_len(s, s1, strlen(s1) + 1);
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index b50796bbe3..261810525b 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -19,6 +19,15 @@
> /* Moved from hw/ppc/spapr_pci_nvlink2.c */
> #define SPAPR_GPU_NUMA_ID (cpu_to_be32(1))
>
> +static bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr)
> +{
> + MachineState *machine = MACHINE(spapr);
> + SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(machine);
> +
> + return smc->pre_5_2_numa_associativity ||
> + machine->numa_state->num_nodes <= 1;
> +}
> +
> static bool spapr_numa_is_symmetrical(MachineState *ms)
> {
> int src, dst;
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index c27c7ce515..ccbeeca1de 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -851,7 +851,6 @@ int spapr_max_server_number(SpaprMachineState *spapr);
> void spapr_store_hpte(PowerPCCPU *cpu, hwaddr ptex,
> uint64_t pte0, uint64_t pte1);
> void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered);
> -bool spapr_machine_using_legacy_numa(SpaprMachineState *spapr);
>
> /* DRC callbacks. */
> void spapr_core_release(DeviceState *dev);
--
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
- [PATCH 0/3] spapr, spapr_numa: fix max-associativity-domains, Daniel Henrique Barboza, 2021/01/28
- [PATCH 1/3] spapr: move spapr_machine_using_legacy_numa() to spapr_numa.c, Daniel Henrique Barboza, 2021/01/28
- [PATCH 3/3] spapr_numa.c: fix ibm, max-associativity-domains calculation, Daniel Henrique Barboza, 2021/01/28
- [PATCH 2/3] spapr_numa.c: create spapr_numa_initial_nvgpu_NUMA_id() helper, Daniel Henrique Barboza, 2021/01/28
- Re: [PATCH 0/3] spapr, spapr_numa: fix max-associativity-domains, Greg Kurz, 2021/01/28