On Thu, May 07, 2015 at 10:20:03AM +0530, Bharata B Rao wrote: > On Thu, May 07, 2015 at 01:57:03PM +1000, David Gibson wrote: > > 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: David Gibson <da...@gibson.dropbear.id.au> > > --- > > hw/ppc/spapr.c | 4 +--- > > include/hw/ppc/spapr.h | 2 +- > > 2 files changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > > index 1123358..c4c7a07 100644 > > --- a/hw/ppc/spapr.c > > +++ b/hw/ppc/spapr.c > > @@ -928,7 +928,7 @@ static void ppc_spapr_reset(void) > > first_ppc_cpu->env.gpr[3] = sm->fdt_addr; > > first_ppc_cpu->env.gpr[5] = 0; > > first_cpu->halted = 0; > > - first_ppc_cpu->env.nip = sm->entry_point; > > + first_ppc_cpu->env.nip = SPAPR_ENTRY_POINT; > > > > } > > > > @@ -1641,8 +1641,6 @@ static void ppc_spapr_init(MachineState *machine) > > } > > g_free(filename); > > > > - sm->entry_point = 0x100; > > - > > /* FIXME: Should register thigs through the MachineState's qdev > > * interface, this is a legacy from the sPAPREnvironment structure > > * which predated MachineState but had a similar function */ > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > > index 9e7cf0f..108ff45 100644 > > --- a/include/hw/ppc/spapr.h > > +++ b/include/hw/ppc/spapr.h > > @@ -13,6 +13,7 @@ typedef struct sPAPRConfigureConnectorState > > sPAPRConfigureConnectorState; > > typedef struct sPAPREventLogEntry sPAPREventLogEntry; > > > > #define HPTE64_V_HPTE_DIRTY 0x0000000000000040ULL > > +#define SPAPR_ENTRY_POINT 0x100 > > checkpatch.pl complains about the use of tab here.
Thanks, fixed.
> Other than that I did a quick compile and VM boot test, things look ok.
>
> Regards,
> Bharata.
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
pgp0Bw4RbDQYH.pgp
Description: PGP signature
