On Tue, Jan 21, 2020 at 12:03:42PM +0100, Philippe Mathieu-Daudé wrote: > We only access this variable in the RTAS_SYSPARM_SPLPAR_CHARACTERISTICS > case. Use it in place and remove the local declaration. > > Suggested-by: Greg Kurz <gr...@kaod.org> > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> v2: Do not reduce MachineState variable scope (David Gibson)
> ---
> hw/ppc/spapr_rtas.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index 6f06e9d7fe..85135e0e1a 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -268,7 +268,6 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu,
> {
> PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> MachineState *ms = MACHINE(spapr);
> - unsigned int max_cpus = ms->smp.max_cpus;
> target_ulong parameter = rtas_ld(args, 0);
> target_ulong buffer = rtas_ld(args, 1);
> target_ulong length = rtas_ld(args, 2);
> @@ -280,10 +279,10 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU
> *cpu,
> "DesMem=%" PRIu64 ","
> "DesProcs=%d,"
> "MaxPlatProcs=%d",
> - max_cpus,
> + ms->smp.max_cpus,
> ms->ram_size / MiB,
> ms->smp.cpus,
> - max_cpus);
> + ms->smp.max_cpus);
> if (pcc->n_host_threads > 0) {
> char *hostthr_val, *old = param_val;
>
--
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
