From: Alexander Graf <agraf@suse.de>
Date: Sun, 6 Apr 2014 20:40:47 +0000 (+0200)
Subject: PPC: Only enter MSR_POW when no interrupts pending
X-Git-Tag: qemu-xen-4.5.0-rc1~42^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=05edc26c61d416831822b3186df099e8e21745b9;p=qemu-upstream-4.5-testing.git

PPC: Only enter MSR_POW when no interrupts pending

We were entering the power saving state even when interrupts (like an
external interrupt or a decrementer interrupt) were still in flight.

In case we find a pending interrupt, don't enter power saving state.

Signed-off-by: Alexander Graf <agraf@suse.de>
Reviewed-by: Tom Musta <tmusta@gmail.com>
---

diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h
index f7ec9c2b8..271fddf17 100644
--- a/target-ppc/helper_regs.h
+++ b/target-ppc/helper_regs.h
@@ -101,7 +101,7 @@ static inline int hreg_store_msr(CPUPPCState *env, target_ulong value,
     hreg_compute_hflags(env);
 #if !defined(CONFIG_USER_ONLY)
     if (unlikely(msr_pow == 1)) {
-        if ((*env->check_pow)(env)) {
+        if (!env->pending_interrupts && (*env->check_pow)(env)) {
             cs->halted = 1;
             excp = EXCP_HALTED;
         }