Commit cae172ab authored by David Gibson's avatar David Gibson
Browse files

pseries: Remove rtas_addr and fdt_addr fields from machinestate 



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

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 997b6cfc

hw/ppc/spapr.c

+7 −7
Original line number Diff line number Diff line
@@ -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,12 +1182,12 @@ 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));

    g_free(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;

include/hw/ppc/spapr.h

+0 −1
Original line number Diff line number Diff line
@@ -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;