| Message ID | 20191022134632.29098-7-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: reset the interrupt presenter from the CPU reset handler | expand |
On Tue, 22 Oct 2019 15:46:31 +0200 Cédric Le Goater <clg@kaod.org> wrote: > The 'vcpu' suffix is inherited from the sPAPR machine. Use better > names for PowerNV. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/pnv_core.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c > index 127107ab7c63..328ad07c8d06 100644 > --- a/hw/ppc/pnv_core.c > +++ b/hw/ppc/pnv_core.c > @@ -163,7 +163,7 @@ static const MemoryRegionOps pnv_core_power9_xscom_ops = { > .endianness = DEVICE_BIG_ENDIAN, > }; > > -static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) > +static void pnv_core_cpu_realize(PowerPCCPU *cpu, PnvChip *chip, Error **errp) > { > CPUPPCState *env = &cpu->env; > int core_pir; > @@ -248,7 +248,7 @@ static void pnv_core_realize(DeviceState *dev, Error **errp) > } > > for (j = 0; j < cc->nr_threads; j++) { > - pnv_realize_vcpu(pc->threads[j], pc->chip, &local_err); > + pnv_core_cpu_realize(pc->threads[j], pc->chip, &local_err); > if (local_err) { > goto err; > } > @@ -270,7 +270,7 @@ err: > error_propagate(errp, local_err); > } > > -static void pnv_unrealize_vcpu(PowerPCCPU *cpu) > +static void pnv_core_cpu_unrealize(PowerPCCPU *cpu) > { > PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); > > @@ -290,7 +290,7 @@ static void pnv_core_unrealize(DeviceState *dev, Error **errp) > qemu_unregister_reset(pnv_core_reset, pc); > > for (i = 0; i < cc->nr_threads; i++) { > - pnv_unrealize_vcpu(pc->threads[i]); > + pnv_core_cpu_unrealize(pc->threads[i]); > } > g_free(pc->threads); > }
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c index 127107ab7c63..328ad07c8d06 100644 --- a/hw/ppc/pnv_core.c +++ b/hw/ppc/pnv_core.c @@ -163,7 +163,7 @@ static const MemoryRegionOps pnv_core_power9_xscom_ops = { .endianness = DEVICE_BIG_ENDIAN, }; -static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp) +static void pnv_core_cpu_realize(PowerPCCPU *cpu, PnvChip *chip, Error **errp) { CPUPPCState *env = &cpu->env; int core_pir; @@ -248,7 +248,7 @@ static void pnv_core_realize(DeviceState *dev, Error **errp) } for (j = 0; j < cc->nr_threads; j++) { - pnv_realize_vcpu(pc->threads[j], pc->chip, &local_err); + pnv_core_cpu_realize(pc->threads[j], pc->chip, &local_err); if (local_err) { goto err; } @@ -270,7 +270,7 @@ err: error_propagate(errp, local_err); } -static void pnv_unrealize_vcpu(PowerPCCPU *cpu) +static void pnv_core_cpu_unrealize(PowerPCCPU *cpu) { PnvCPUState *pnv_cpu = pnv_cpu_state(cpu); @@ -290,7 +290,7 @@ static void pnv_core_unrealize(DeviceState *dev, Error **errp) qemu_unregister_reset(pnv_core_reset, pc); for (i = 0; i < cc->nr_threads; i++) { - pnv_unrealize_vcpu(pc->threads[i]); + pnv_core_cpu_unrealize(pc->threads[i]); } g_free(pc->threads); }
The 'vcpu' suffix is inherited from the sPAPR machine. Use better names for PowerNV. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/ppc/pnv_core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)