From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
qemu-ppc@nongnu.org,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Cédric Le Goater" <clg@kaod.org>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 3/4] hw/ppc/spapr_hcall: Rename {softmmu -> tcgppc}_resize_hpt_prepare/commit
Date: Mon, 2 Oct 2023 16:38:53 +0200 [thread overview]
Message-ID: <20231002143855.50978-4-philmd@linaro.org> (raw)
In-Reply-To: <20231002143855.50978-1-philmd@linaro.org>
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(-)
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();
}
--
2.41.0
next prev parent reply other threads:[~2023-10-02 14:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 14:38 [PATCH 0/4] hw/ppc/spapr: Rename SoftMMU -> TCG Philippe Mathieu-Daudé
2023-10-02 14:38 ` [PATCH 1/4] hw/ppc/spapr: Add missing license Philippe Mathieu-Daudé
2023-10-02 14:38 ` [PATCH 2/4] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prepare/commit Philippe Mathieu-Daudé
2023-10-02 14:38 ` Philippe Mathieu-Daudé [this message]
2023-10-03 2:03 ` [PATCH 3/4] hw/ppc/spapr_hcall: Rename {softmmu -> tcgppc}_resize_hpt_prepare/commit David Gibson
2023-10-02 14:38 ` [PATCH 4/4] hw/ppc/spapr: Rename 'softmmu' -> 'tcg' Philippe Mathieu-Daudé
2023-10-03 2:07 ` David Gibson
2023-10-18 12:58 ` Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002143855.50978-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=harshpb@linux.ibm.com \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).