From: Nicholas Piggin <npiggin@gmail.com>
Date: Tue, 20 Jun 2023 10:57:34 +0000 (+1000)
Subject: ppc/spapr: H_ENTER_NESTED should restore host XER ca field
X-Git-Tag: v8.1.0-rc0~45^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb2f6c3d69ea5b5bdc37c8330266ab67db629fc5;p=thirdparty%2Fqemu.git

ppc/spapr: H_ENTER_NESTED should restore host XER ca field

Fix missing env->ca restore when going from L2 back to the host.

Fixes: 120f738a467 ("spapr: implement nested-hv capability for the virtual hypervisor")
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index b9047555757..0582b524d10 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1773,6 +1773,7 @@ out_restore_l1:
     env->cfar = spapr_cpu->nested_host_state->cfar;
     env->xer = spapr_cpu->nested_host_state->xer;
     env->so = spapr_cpu->nested_host_state->so;
+    env->ca = spapr_cpu->nested_host_state->ca;
     env->ov = spapr_cpu->nested_host_state->ov;
     env->ov32 = spapr_cpu->nested_host_state->ov32;
     env->ca32 = spapr_cpu->nested_host_state->ca32;