Message ID | 20200109152133.23649-3-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Replace current_machine by qdev_get_machine() | expand |
On Thu, 9 Jan 2020 16:21:20 +0100 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > Since we have the MachineState already available locally, > ues it instead of the global current_machine. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr_rtas.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c > index 8d8d8cdfcb..e88bb1930e 100644 > --- a/hw/ppc/spapr_rtas.c > +++ b/hw/ppc/spapr_rtas.c > @@ -281,7 +281,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, > "DesProcs=%d," > "MaxPlatProcs=%d", > max_cpus, > - current_machine->ram_size / MiB, > + ms->ram_size / MiB, > ms->smp.cpus, > max_cpus); > if (pcc->n_host_threads > 0) {
On Thu, Jan 09, 2020 at 04:21:20PM +0100, Philippe Mathieu-Daudé wrote: > Since we have the MachineState already available locally, > ues it instead of the global current_machine. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr_rtas.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c > index 8d8d8cdfcb..e88bb1930e 100644 > --- a/hw/ppc/spapr_rtas.c > +++ b/hw/ppc/spapr_rtas.c > @@ -281,7 +281,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, > "DesProcs=%d," > "MaxPlatProcs=%d", > max_cpus, > - current_machine->ram_size / MiB, > + ms->ram_size / MiB, > ms->smp.cpus, > max_cpus); > if (pcc->n_host_threads > 0) {
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 8d8d8cdfcb..e88bb1930e 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -281,7 +281,7 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, "DesProcs=%d," "MaxPlatProcs=%d", max_cpus, - current_machine->ram_size / MiB, + ms->ram_size / MiB, ms->smp.cpus, max_cpus); if (pcc->n_host_threads > 0) {
Since we have the MachineState already available locally, ues it instead of the global current_machine. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/ppc/spapr_rtas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)