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>
---
 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 f008290787..08b50590a8 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

Excerpts from Fabiano Rosas's message of March 26, 2022 8:11 am:
> 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.
 
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>

> 
> Signed-off-by: Fabiano Rosas <farosas@linux.ibm.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 f008290787..08b50590a8 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
> 
>