Commit 1b718907 authored by David Gibson's avatar David Gibson Committed by Alexander Graf
Browse files

spapr: Remove obsolete entry_point field from sPAPRMachineState 



The sPAPRMachineState structure includes an entry_point field containing
the initial PC value for starting the machine, even though this always has
the value 0x100.

I think this is a hangover from very early versions which bypassed the
firmware when using -kernel.  In any case it has no function now, so remove
it.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent fb164994

hw/ppc/spapr.c

+1 −3
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static void ppc_spapr_reset(void) 
    first_ppc_cpu->env.gpr[3] = spapr->fdt_addr;

    first_ppc_cpu->env.gpr[5] = 0;

    first_cpu->halted = 0;

    first_ppc_cpu->env.nip = spapr->entry_point;

    first_ppc_cpu->env.nip = SPAPR_ENTRY_POINT;



}
@@ -1645,8 +1645,6 @@ static void ppc_spapr_init(MachineState *machine) 
    }

    g_free(filename);



    spapr->entry_point = 0x100;



    /* FIXME: Should register things through the MachineState's qdev

     * interface, this is a legacy from the sPAPREnvironment structure

     * which predated MachineState but had a similar function */

include/hw/ppc/spapr.h

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ typedef struct sPAPRConfigureConnectorState sPAPRConfigureConnectorState; 
typedef struct sPAPREventLogEntry sPAPREventLogEntry;



#define HPTE64_V_HPTE_DIRTY     0x0000000000000040ULL

#define SPAPR_ENTRY_POINT       0x100



typedef struct sPAPRMachineState sPAPRMachineState;
@@ -41,7 +42,6 @@ struct sPAPRMachineState { 
    ssize_t rtas_size;

    void *rtas_blob;

    void *fdt_skel;

    target_ulong entry_point;

    uint64_t rtc_offset; /* Now used only during incoming migration */

    struct PPCTimebase tb;

    bool has_graphics;