On Fri, Feb 09, 2018 at 04:13:30PM -0200, Daniel Henrique Barboza wrote:
> Commit bcb5ce08cf ("spapr: Rename machine init functions for clarity")
> renamed ppc_spapr_reset to spapr_machine_reset and ppc_spapr_init
> to spapr_machine_init. Let's also rename the references in
> comments.
>
> Signed-off-by: Daniel Henrique Barboza <danie...@linux.vnet.ibm.com>
Nice catch, applied.
> ---
> hw/ppc/spapr.c | 3 ++-
> hw/ppc/spapr_hcall.c | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 659be6b746..96515036e6 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -464,7 +464,8 @@ static int spapr_populate_memory(sPAPRMachineState
> *spapr, void *fdt)
> }
> }
> if (!mem_start) {
> - /* ppc_spapr_init() checks for rma_size <= node0_size already */
> + /* spapr_machine_init() checks for rma_size <= node0_size
> + * already */
> spapr_populate_memory_node(fdt, i, 0, spapr->rma_size);
> mem_start += spapr->rma_size;
> node_size -= spapr->rma_size;
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 4d0e6eb0cf..badf01cece 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1635,7 +1635,7 @@ static target_ulong
> h_client_architecture_support(PowerPCCPU *cpu,
> spapr->cas_legacy_guest_workaround = !spapr_ovec_test(ov1_guest,
> OV1_PPC_3_00);
> if (!spapr->cas_reboot) {
> - /* If ppc_spapr_reset() did not set up a HPT but one is necessary
> + /* If spapr_machine_reset() did not set up a HPT but one is necessary
> * (because the guest isn't going to use radix) then set it up here.
> */
> if ((spapr->patb_entry & PATBE1_GR) && !guest_radix) {
> /* legacy hash or new hash: */
--
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
signature.asc
Description: PGP signature
