From: David Gibson <david@gibson.dropbear.id.au>
To: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, groug@kaod.org
Cc: agraf@suse.de, lvivier@redhat.com, thuth@redhat.com,
qemu-ppc@nongnu.org, qemu-devel@nongnu.org,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH 03/13] pseries: Remove rtas_addr and fdt_addr fields from machinestate
Date: Thu, 20 Oct 2016 16:12:00 +1100 [thread overview]
Message-ID: <1476940330-27705-4-git-send-email-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <1476940330-27705-1-git-send-email-david@gibson.dropbear.id.au>
These values are used only within ppc_spapr_reset(), so just change them
to local variables.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---
hw/ppc/spapr.c | 14 +++++++-------
include/hw/ppc/spapr.h | 1 -
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 7ff3590..c4baca9 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1135,6 +1135,7 @@ static void ppc_spapr_reset(void)
sPAPRMachineState *spapr = SPAPR_MACHINE(machine);
PowerPCCPU *first_ppc_cpu;
uint32_t rtas_limit;
+ hwaddr rtas_addr, fdt_addr;
void *fdt;
int rc;
@@ -1160,14 +1161,13 @@ static void ppc_spapr_reset(void)
* processed with 32-bit real mode code if necessary
*/
rtas_limit = MIN(spapr->rma_size, RTAS_MAX_ADDR);
- spapr->rtas_addr = rtas_limit - RTAS_MAX_SIZE;
- spapr->fdt_addr = spapr->rtas_addr - FDT_MAX_SIZE;
+ rtas_addr = rtas_limit - RTAS_MAX_SIZE;
+ fdt_addr = rtas_addr - FDT_MAX_SIZE;
- fdt = spapr_build_fdt(spapr, spapr->rtas_addr, spapr->rtas_size);
+ fdt = spapr_build_fdt(spapr, rtas_addr, spapr->rtas_size);
/* Copy RTAS over */
- cpu_physical_memory_write(spapr->rtas_addr, spapr->rtas_blob,
- spapr->rtas_size);
+ cpu_physical_memory_write(rtas_addr, spapr->rtas_blob, spapr->rtas_size);
rc = fdt_pack(fdt);
@@ -1182,11 +1182,11 @@ static void ppc_spapr_reset(void)
/* Load the fdt */
qemu_fdt_dumpdtb(fdt, fdt_totalsize(fdt));
- cpu_physical_memory_write(spapr->fdt_addr, fdt, fdt_totalsize(fdt));
+ cpu_physical_memory_write(fdt_addr, fdt, fdt_totalsize(fdt));
/* Set up the entry state */
first_ppc_cpu = POWERPC_CPU(first_cpu);
- first_ppc_cpu->env.gpr[3] = spapr->fdt_addr;
+ first_ppc_cpu->env.gpr[3] = fdt_addr;
first_ppc_cpu->env.gpr[5] = 0;
first_cpu->halted = 0;
first_ppc_cpu->env.nip = SPAPR_ENTRY_POINT;
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
index aeaba3e..1174741 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -63,7 +63,6 @@ struct sPAPRMachineState {
uint32_t htab_shift;
hwaddr rma_size;
int vrma_adjust;
- hwaddr fdt_addr, rtas_addr;
ssize_t rtas_size;
void *rtas_blob;
void *fdt_skel;
--
2.7.4
next prev parent reply other threads:[~2016-10-20 5:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-20 5:11 [Qemu-devel] [PATCH 00/13] pseries: Consolidate guest device tree construction David Gibson
2016-10-20 5:11 ` [Qemu-devel] [PATCH 01/13] pseries: Remove unused callbacks from sPAPR VIO bus state David Gibson
2016-10-20 6:55 ` Thomas Huth
2016-10-20 5:11 ` [Qemu-devel] [PATCH 02/13] pseries: Split device tree construction from device tree load David Gibson
2016-10-20 7:03 ` Thomas Huth
2016-10-21 1:24 ` David Gibson
2016-10-20 5:12 ` David Gibson [this message]
2016-10-20 5:12 ` [Qemu-devel] [PATCH 04/13] pseries: Make spapr_create_fdt_skel() get information from machine state David Gibson
2016-10-20 7:19 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 05/13] pseries: Move adding of fdt reserve map entries David Gibson
2016-10-20 5:12 ` [Qemu-devel] [PATCH 06/13] pseries: Consolidate RTAS loading David Gibson
2016-10-20 5:12 ` [Qemu-devel] [PATCH 07/13] spapr: Move construction of /interrupt-controller fdt node David Gibson
2016-10-20 7:27 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 08/13] spapr: Consolidate construction of /chosen device tree node David Gibson
2016-10-20 7:48 ` Thomas Huth
2016-10-20 7:49 ` Thomas Huth
2016-10-21 1:41 ` David Gibson
2016-10-20 5:12 ` [Qemu-devel] [PATCH 09/13] pseries: Consolidate construction of /rtas " David Gibson
2016-10-20 8:39 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 10/13] spapr: Move /event-sources construction to spapr_build_fdt() David Gibson
2016-10-20 8:42 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 11/13] spapr: Move /hypervisor node construction to fdt_build_fdt() David Gibson
2016-10-20 8:44 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 12/13] spapr: Consolidate construction of /vdevice device tree node David Gibson
2016-10-20 8:49 ` Thomas Huth
2016-10-20 5:12 ` [Qemu-devel] [PATCH 13/13] spapr: Remove spapr_create_fdt_skel() David Gibson
2016-10-20 8:54 ` Thomas Huth
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=1476940330-27705-4-git-send-email-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=thuth@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.