[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/23] spapr: Move hypercall_register_softmmu
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 08/23] spapr: Move hypercall_register_softmmu |
Date: |
Wed, 20 Apr 2022 19:13:14 -0300 |
From: Fabiano Rosas <farosas@linux.ibm.com>
I'm moving this because next patch will add more code under the ifdef
and it will be cleaner if we keep them together.
Also switch the ifdef branches to make it more convenient to add code
under CONFIG_TCG in the next patch.
Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Message-Id: <20220325221113.255834-2-farosas@linux.ibm.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr_hcall.c | 50 ++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 7c8bb76f99..9b24db5e44 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1473,31 +1473,6 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu,
target_ulong opcode,
return H_FUNCTION;
}
-#ifndef CONFIG_TCG
-static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr,
- target_ulong opcode, target_ulong *args)
-{
- g_assert_not_reached();
-}
-
-static void hypercall_register_softmmu(void)
-{
- /* hcall-pft */
- spapr_register_hypercall(H_ENTER, h_softmmu);
- spapr_register_hypercall(H_REMOVE, h_softmmu);
- spapr_register_hypercall(H_PROTECT, h_softmmu);
- spapr_register_hypercall(H_READ, h_softmmu);
-
- /* hcall-bulk */
- spapr_register_hypercall(H_BULK_REMOVE, h_softmmu);
-}
-#else
-static void hypercall_register_softmmu(void)
-{
- /* DO NOTHING */
-}
-#endif
-
/* TCG only */
#define PRTS_MASK 0x1f
@@ -1825,6 +1800,31 @@ out_restore_l1:
spapr_cpu->nested_host_state = NULL;
}
+#ifdef CONFIG_TCG
+static void hypercall_register_softmmu(void)
+{
+ /* DO NOTHING */
+}
+#else
+static target_ulong h_softmmu(PowerPCCPU *cpu, SpaprMachineState *spapr,
+ target_ulong opcode, target_ulong *args)
+{
+ g_assert_not_reached();
+}
+
+static void hypercall_register_softmmu(void)
+{
+ /* hcall-pft */
+ spapr_register_hypercall(H_ENTER, h_softmmu);
+ spapr_register_hypercall(H_REMOVE, h_softmmu);
+ spapr_register_hypercall(H_PROTECT, h_softmmu);
+ spapr_register_hypercall(H_READ, h_softmmu);
+
+ /* hcall-bulk */
+ spapr_register_hypercall(H_BULK_REMOVE, h_softmmu);
+}
+#endif
+
static void hypercall_register_types(void)
{
hypercall_register_softmmu();
--
2.35.1
- [PULL 00/23] ppc queue, Daniel Henrique Barboza, 2022/04/20
- [PULL 01/23] ppc/pnv: Update skiboot to v7.0, Daniel Henrique Barboza, 2022/04/20
- [PULL 02/23] ppc/spapr/ddw: Add 2M pagesize, Daniel Henrique Barboza, 2022/04/20
- [PULL 03/23] ppc/pnv: Fix PSI IRQ definition, Daniel Henrique Barboza, 2022/04/20
- [PULL 04/23] ppc/pnv: Remove PnvLpcController::psi link, Daniel Henrique Barboza, 2022/04/20
- [PULL 05/23] ppc/pnv: Remove PnvOCC::psi link, Daniel Henrique Barboza, 2022/04/20
- [PULL 06/23] ppc/pnv: Remove PnvPsiClas::irq_set, Daniel Henrique Barboza, 2022/04/20
- [PULL 07/23] ppc/pnv: Remove useless checks in set_irq handlers, Daniel Henrique Barboza, 2022/04/20
- [PULL 08/23] spapr: Move hypercall_register_softmmu,
Daniel Henrique Barboza <=
- [PULL 09/23] spapr: Move nested KVM hypercalls under a TCG only config., Daniel Henrique Barboza, 2022/04/20
- [PULL 10/23] target/ppc: Improve KVM hypercall trace, Daniel Henrique Barboza, 2022/04/20
- [PULL 11/23] qemu/int128: add int128_urshift, Daniel Henrique Barboza, 2022/04/20
- [PULL 12/23] softfloat: add uint128_to_float128, Daniel Henrique Barboza, 2022/04/20
- [PULL 13/23] softfloat: add int128_to_float128, Daniel Henrique Barboza, 2022/04/20
- [PULL 14/23] softfloat: add float128_to_uint128, Daniel Henrique Barboza, 2022/04/20
- [PULL 15/23] softfloat: add float128_to_int128, Daniel Henrique Barboza, 2022/04/20
- [PULL 16/23] target/ppc: implement xscv[su]qqp, Daniel Henrique Barboza, 2022/04/20
- [PULL 17/23] target/ppc: implement xscvqp[su]qz, Daniel Henrique Barboza, 2022/04/20
- [PULL 18/23] hw/ppc/ppc405_boards: Initialize g_autofree pointer, Daniel Henrique Barboza, 2022/04/20