mirror of https://github.com/xemu-project/xemu.git
hw/ppc/spapr_hcall: Rename {softmmu -> vhyp_mmu}_resize_hpt_pr
Since 'softmmu' is quite a loaded term in QEMU, rename the vhyp MMU facilities to use the vhyp_mmu_ prefix rather than softmmu_. vhyp_mmu_ is chosen because the code that manipulates the hash table via guest software hypercalls is QEMU's implementation of the PAPR hypervisor interface, called vhyp. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> [npiggin: Pick a different name, explain it in changelog.] Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
aea75803a4
commit
a3d0cf82df
|
@ -124,7 +124,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 vhyp_mmu_resize_hpt_prepare(cpu, spapr, shift);
|
||||
} else {
|
||||
g_assert_not_reached();
|
||||
}
|
||||
|
@ -194,7 +194,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 vhyp_mmu_resize_hpt_commit(cpu, spapr, flags, shift);
|
||||
} else {
|
||||
g_assert_not_reached();
|
||||
}
|
||||
|
|
|
@ -378,7 +378,7 @@ static void cancel_hpt_prepare(SpaprMachineState *spapr)
|
|||
free_pending_hpt(pending);
|
||||
}
|
||||
|
||||
target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu,
|
||||
target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu,
|
||||
SpaprMachineState *spapr,
|
||||
target_ulong shift)
|
||||
{
|
||||
|
@ -562,7 +562,7 @@ static int rehash_hpt(PowerPCCPU *cpu,
|
|||
return H_SUCCESS;
|
||||
}
|
||||
|
||||
target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu,
|
||||
target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu,
|
||||
SpaprMachineState *spapr,
|
||||
target_ulong flags,
|
||||
target_ulong shift)
|
||||
|
|
|
@ -634,10 +634,13 @@ 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 vhyp_mmu_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 vhyp_mmu_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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue