| Message ID | 20231002143855.50978-4-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/ppc/spapr: Rename SoftMMU -> TCG | expand |
On Mon, Oct 02, 2023 at 04:38:53PM +0200, Philippe Mathieu-Daudé wrote: > We use the 'kvmppc' prefix for KVM specific functions: > > $ git grep \ kvmppc_ | wc -l > 402 > > Following the same pattern for TCG specific functions, > use the 'tcgppc' prefix (which is clearer than 'softmmu'). In this specific case, I think "softmmu" is more accurate than "tcg". These are specifically related to the emulated MMU, and not really to instruction emulation per se. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/hw/ppc/spapr.h | 8 ++++---- > hw/ppc/spapr_hcall.c | 4 ++-- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index e91791a1a9..160a5823fb 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -634,10 +634,10 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); > target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, > target_ulong *args); > > -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, > - target_ulong shift); > -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, > - target_ulong flags, target_ulong shift); > +target_ulong tcgppc_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, > + target_ulong shift); > +target_ulong tcgppc_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, > + target_ulong flags, target_ulong shift); > bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); > void push_sregs_to_kvm_pr(SpaprMachineState *spapr); > > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index a860c626b7..7b0f2e2e1c 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -125,7 +125,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, > if (kvm_enabled()) { > return H_HARDWARE; > } else if (tcg_enabled()) { > - return softmmu_resize_hpt_prepare(cpu, spapr, shift); > + return tcgppc_resize_hpt_prepare(cpu, spapr, shift); > } else { > g_assert_not_reached(); > } > @@ -195,7 +195,7 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, > if (kvm_enabled()) { > return H_HARDWARE; > } else if (tcg_enabled()) { > - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); > + return tcgppc_resize_hpt_commit(cpu, spapr, flags, shift); > } else { > g_assert_not_reached(); > }
diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e91791a1a9..160a5823fb 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -634,10 +634,10 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, - target_ulong shift); -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, - target_ulong flags, target_ulong shift); +target_ulong tcgppc_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, + target_ulong shift); +target_ulong tcgppc_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, + target_ulong flags, target_ulong shift); bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); void push_sregs_to_kvm_pr(SpaprMachineState *spapr); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index a860c626b7..7b0f2e2e1c 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -125,7 +125,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_prepare(cpu, spapr, shift); + return tcgppc_resize_hpt_prepare(cpu, spapr, shift); } else { g_assert_not_reached(); } @@ -195,7 +195,7 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + return tcgppc_resize_hpt_commit(cpu, spapr, flags, shift); } else { g_assert_not_reached(); }
We use the 'kvmppc' prefix for KVM specific functions: $ git grep \ kvmppc_ | wc -l 402 Following the same pattern for TCG specific functions, use the 'tcgppc' prefix (which is clearer than 'softmmu'). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/hw/ppc/spapr.h | 8 ++++---- hw/ppc/spapr_hcall.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)