From 8a9c1b77e9df5b4a9fcc1ffe08b4fcff7b0c791f Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Wed, 17 Feb 2016 19:23:19 +0100 Subject: [PATCH] hw/ppc/spapr: Halt CPU when powering off via RTAS call The LoPAPR specification defines the following for the RTAS power-off call: "On successful operation, does not return". However, the implementation in QEMU currently returns and runs the guest CPU again for some more cycles. This caused some trouble with the new ppc implementation of the kvm-unit-tests recently. So let's make sure that the QEMU implementation follows the spec, thus stop the CPU to make sure that the RTAS call does not return to the guest anymore. Signed-off-by: Thomas Huth Tested-by: Andrew Jones Signed-off-by: David Gibson --- hw/ppc/spapr_rtas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 07ad672e5a..b7c5ebde40 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -113,6 +113,7 @@ static void rtas_power_off(PowerPCCPU *cpu, sPAPRMachineState *spapr, return; } qemu_system_shutdown_request(); + cpu_stop_current(); rtas_st(rets, 0, RTAS_OUT_SUCCESS); }