From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Cornelia Huck" <cohuck@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Like Xu" <like.xu@linux.intel.com>,
"David Hildenbrand" <david@redhat.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Greg Kurz" <groug@kaod.org>,
qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [PATCH v2 03/10] hw/ppc/spapr_rtas: Remove local variable
Date: Tue, 21 Jan 2020 12:03:42 +0100 [thread overview]
Message-ID: <20200121110349.25842-4-philmd@redhat.com> (raw)
In-Reply-To: <20200121110349.25842-1-philmd@redhat.com>
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 <groug@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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;
--
2.21.1
next prev parent reply other threads:[~2020-01-21 11:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-21 11:03 [PATCH v2 00/10] Cleanups around the 'current_machine' global variable Philippe Mathieu-Daudé
2020-01-21 11:03 ` [PATCH v2 01/10] hw/ppc/spapr_rtas: Use local MachineState variable Philippe Mathieu-Daudé
2020-01-21 11:03 ` [PATCH v2 02/10] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument Philippe Mathieu-Daudé
2020-01-21 11:03 ` Philippe Mathieu-Daudé [this message]
2020-01-22 3:27 ` [PATCH v2 03/10] hw/ppc/spapr_rtas: Remove local variable David Gibson
2020-01-21 11:03 ` [PATCH v2 04/10] target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() Philippe Mathieu-Daudé
2020-01-21 11:03 ` [PATCH v2 05/10] target/s390x: Remove duplicated ifdef macro Philippe Mathieu-Daudé
2020-01-21 13:52 ` Cornelia Huck
2020-01-21 16:45 ` Cornelia Huck
2020-01-21 11:03 ` [PATCH v2 06/10] qom/object: Display more helpful message when a parent is missing Philippe Mathieu-Daudé
2020-01-21 13:54 ` Cornelia Huck
2020-01-21 11:03 ` [PATCH v2 07/10] qdev: Abort if the root machine container " Philippe Mathieu-Daudé
2020-01-21 12:45 ` Markus Armbruster
2020-01-21 11:03 ` [PATCH v2 08/10] accel: Introduce the current_accel() wrapper Philippe Mathieu-Daudé
2020-01-21 13:56 ` Cornelia Huck
2020-01-21 11:03 ` [PATCH v2 09/10] accel: Replace current_machine->accelerator by " Philippe Mathieu-Daudé
2020-01-21 14:03 ` Cornelia Huck
2020-01-22 3:28 ` David Gibson
2020-01-21 11:03 ` [PATCH v2 10/10] accel/tcg: Sanitize include path Philippe Mathieu-Daudé
2020-01-21 14:06 ` Cornelia Huck
2020-01-21 12:47 ` [PATCH v2 00/10] Cleanups around the 'current_machine' global variable Markus Armbruster
2020-01-21 12:49 ` Philippe Mathieu-Daudé
2020-01-21 16:27 ` Paolo Bonzini
2020-01-21 16:44 ` Cornelia Huck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200121110349.25842-4-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=armbru@redhat.com \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=like.xu@linux.intel.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).