From: Alexander Graf <agraf@suse.de>
Date: Fri, 20 Jan 2012 03:06:18 +0000 (+0100)
Subject: PPC: booke206: allow NULL raddr in ppcmas_tlb_check
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ffba87862b37f1d7762370c8d31b09f6e359ff09;p=qemu.git

PPC: booke206: allow NULL raddr in ppcmas_tlb_check

We might want to call the tlb check function without actually caring about
the real address resolution. Check if we really should write the value
back.

Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 58474536c0..2ce2d9238f 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -1338,7 +1338,10 @@ int ppcmas_tlb_check(CPUState *env, ppcmas_tlb_t *tlb,
     if ((address & mask) != (tlb->mas2 & MAS2_EPN_MASK)) {
         return -1;
     }
-    *raddrp = (tlb->mas7_3 & mask) | (address & ~mask);
+
+    if (raddrp) {
+        *raddrp = (tlb->mas7_3 & mask) | (address & ~mask);
+    }
 
     return 0;
 }