[Qemu-ppc] [PATCH] PPC: e500: Fix broken check for valid cpu_index

[Ben Collins]

This commit...

commit 55e5c2850293547203874098f7cec148ffd12dfa
Author: Andreas Färber <address@hidden>
Date:   Mon Dec 17 06:18:02 2012 +0100

   cpu: Move cpu_index field to CPUState

...broke the logic after the for-loop that finds CPU based on cpu_index in
ppce500_spin.c and e500.c. This patch reverts to proper logic to check
for an unknown CPU index.

Signed-off-by: Ben Collins <address@hidden>
---
hw/ppc/e500.c     | 2 +-
hw/ppce500_spin.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index c36821a..2cb17c6 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -251,7 +251,7 @@ static int ppce500_load_device_tree(CPUPPCState *env,
            }
        }

-        if (cpu == NULL) {
+        if (!env) {
            continue;
        }

diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c
index 4c206e2..002bd19 100644
--- a/hw/ppce500_spin.c
+++ b/hw/ppce500_spin.c
@@ -124,18 +124,17 @@ static void spin_write(void *opaque, hwaddr addr, 
uint64_t value,
    SpinState *s = opaque;
    int env_idx = addr / sizeof(SpinInfo);
    CPUPPCState *env;
-    CPUState *cpu = NULL;
    SpinInfo *curspin = &s->spin[env_idx];
    uint8_t *curspin_p = (uint8_t*)curspin;

    for (env = first_cpu; env != NULL; env = env->next_cpu) {
-        cpu = CPU(ppc_env_get_cpu(env));
+        CPUState *cpu = CPU(ppc_env_get_cpu(env));
        if (cpu->cpu_index == env_idx) {
            break;
        }
    }

-    if (cpu == NULL) {
+    if (!env) {
        /* Unknown CPU */
        return;
    }
-- 
1.8.0