From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Mon, 27 Jan 2025 10:26:05 +0000 (+0100)
Subject: hw/ppc/spapr: Restrict CONFER hypercall to TCG
X-Git-Tag: v10.0.0-rc0~10^2~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e84d0381578467931d1145a32a55b7e1c3b2b9e;p=thirdparty%2Fqemu.git

hw/ppc/spapr: Restrict CONFER hypercall to TCG

KVM handles H_CONFER and does not pass it along to QEMU, so
only vhyp (as used by TCG spapr) needs to handle it.

[npiggin: Add changelog]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250127102620.39159-2-philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index f987ff323f..4f1933b8da 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -580,6 +580,8 @@ static target_ulong h_confer(PowerPCCPU *cpu, SpaprMachineState *spapr,
     CPUState *cs = CPU(cpu);
     SpaprCpuState *spapr_cpu;
 
+    assert(tcg_enabled()); /* KVM will have handled this */
+
     /*
      * -1 means confer to all other CPUs without dispatch counter check,
      *  otherwise it's a targeted confer.