提交 1b718907 编写于 作者: D David Gibson 提交者: Alexander Graf

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: NDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: NAlexander Graf <agraf@suse.de>
上级 fb164994
...@@ -932,7 +932,7 @@ static void ppc_spapr_reset(void) ...@@ -932,7 +932,7 @@ static void ppc_spapr_reset(void)
first_ppc_cpu->env.gpr[3] = spapr->fdt_addr; first_ppc_cpu->env.gpr[3] = spapr->fdt_addr;
first_ppc_cpu->env.gpr[5] = 0; first_ppc_cpu->env.gpr[5] = 0;
first_cpu->halted = 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) ...@@ -1645,8 +1645,6 @@ static void ppc_spapr_init(MachineState *machine)
} }
g_free(filename); g_free(filename);
spapr->entry_point = 0x100;
/* FIXME: Should register things through the MachineState's qdev /* FIXME: Should register things through the MachineState's qdev
* interface, this is a legacy from the sPAPREnvironment structure * interface, this is a legacy from the sPAPREnvironment structure
* which predated MachineState but had a similar function */ * which predated MachineState but had a similar function */
......
...@@ -13,6 +13,7 @@ typedef struct sPAPRConfigureConnectorState sPAPRConfigureConnectorState; ...@@ -13,6 +13,7 @@ typedef struct sPAPRConfigureConnectorState sPAPRConfigureConnectorState;
typedef struct sPAPREventLogEntry sPAPREventLogEntry; typedef struct sPAPREventLogEntry sPAPREventLogEntry;
#define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL #define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL
#define SPAPR_ENTRY_POINT 0x100
typedef struct sPAPRMachineState sPAPRMachineState; typedef struct sPAPRMachineState sPAPRMachineState;
...@@ -41,7 +42,6 @@ struct sPAPRMachineState { ...@@ -41,7 +42,6 @@ struct sPAPRMachineState {
ssize_t rtas_size; ssize_t rtas_size;
void *rtas_blob; void *rtas_blob;
void *fdt_skel; void *fdt_skel;
target_ulong entry_point;
uint64_t rtc_offset; /* Now used only during incoming migration */ uint64_t rtc_offset; /* Now used only during incoming migration */
struct PPCTimebase tb; struct PPCTimebase tb;
bool has_graphics; bool has_graphics;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册