Re: [Qemu-devel] [RFC for-2.7 03/11] pseries: Remove rtas_addr and fdt_addr fields from machinestate

[Alexey Kardashevskiy]

On 04/20/2016 12:33 PM, David Gibson wrote:

These values are used only within ppc_spapr_reset(), so just change them
to local variables.

Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>

Reviewed-by: Alexey Kardashevskiy <a...@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 26b95ce..b123078 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1126,6 +1126,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;

@@ -1151,14 +1152,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);

@@ -1173,11 +1173,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 815d5ee..655ffe9 100644
--- a/include/hw/ppc/spapr.h
+++ b/include/hw/ppc/spapr.h
@@ -56,7 +56,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;

--
Alexey