[PULL,31/35] target/ppc: Fix the order of kvm_enable judgment about kvmppc_set_interrupt()

Commit Message

Cédric Le Goater Sept. 4, 2023, 9:06 a.m. UTC

From: jianchunfu <[e-mail]>

It's unnecessary for non-KVM accelerators(TCG, for example),
to call this function, so change the order of kvm_enable() judgment.

The static inline function that returns -1 directly does not work
 in TCG's situation.

Signed-off-by: jianchunfu <[e-mail]>
Tested-by: Gautam Menghani <[e-mail]>
Signed-off-by: Cédric Le Goater <[e-mail]>
---
 hw/ppc/ppc.c     | 8 ++++++--
 target/ppc/kvm.c | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 87df91460026..c70882649a7d 100644
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -59,7 +59,9 @@  void ppc_set_irq(PowerPCCPU *cpu, int irq, int level)
 
     if (old_pending != env->pending_interrupts) {
         ppc_maybe_interrupt(env);
-        kvmppc_set_interrupt(cpu, irq, level);
+        if (kvm_enabled()) {
+            kvmppc_set_interrupt(cpu, irq, level);
+        }
     }
 
     trace_ppc_irq_set_exit(env, irq, level, env->pending_interrupts,
@@ -1533,5 +1535,7 @@  void ppc_irq_reset(PowerPCCPU *cpu)
     CPUPPCState *env = &cpu->env;
 
     env->irq_input_state = 0;
-    kvmppc_set_interrupt(cpu, PPC_INTERRUPT_EXT, 0);
+    if (kvm_enabled()) {
+        kvmppc_set_interrupt(cpu, PPC_INTERRUPT_EXT, 0);
+    }
 }
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 769850174385..51112bd3670d 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -1320,7 +1320,7 @@  int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level)
         return 0;
     }
 
-    if (!kvm_enabled() || !cap_interrupt_unset) {
+    if (!cap_interrupt_unset) {
         return 0;
     }