From: Fabiano Rosas <farosas@linux.ibm.com>
Date: Wed, 9 Feb 2022 08:08:55 +0000 (+0100)
Subject: target/ppc: booke: Instruction storage exception cleanup
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b583351d4b149980c07d7f7c26acc937d514783d;p=qemu.git

target/ppc: booke: Instruction storage exception cleanup

The SRR1 should be set to the MSR value. There are no diagnostic bits
in the SRR1 for BookE.

Note that this fixes a bug where MSR_GS would be set and Linux would
go into KVM code when there's no KVM guest.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Message-Id: <20220128224018.1228062-7-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index c8bd78d5cb..8340146902 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -836,7 +836,6 @@ static void powerpc_excp_booke(PowerPCCPU *cpu, int excp)
         break;
     case POWERPC_EXCP_ISI:       /* Instruction storage exception            */
         trace_ppc_excp_isi(msr, env->nip);
-        msr |= env->error_code;
         break;
     case POWERPC_EXCP_EXTERNAL:  /* External input                           */
     {