From: Igor Mammedov <imammedo@redhat.com>
Date: Thu, 7 Mar 2013 18:12:43 +0000 (+0100)
Subject: cpu: Fix qemu_get_cpu() to return NULL if CPU not found
X-Git-Tag: v1.5.0-rc0~471^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d76fddaeeec674cab4802b585db6c9fb3a0066dc;p=thirdparty%2Fqemu.git

cpu: Fix qemu_get_cpu() to return NULL if CPU not found

Commit 55e5c2850 breaks CPU not found return value, and returns
CPU corresponding to the last non NULL env.
Fix it by returning CPU only if env is not NULL, otherwise CPU is
not found and function should return NULL.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/exec.c b/exec.c
index 46a283071a2..0a96ddbc934 100644
--- a/exec.c
+++ b/exec.c
@@ -260,7 +260,7 @@ CPUState *qemu_get_cpu(int index)
         env = env->next_cpu;
     }
 
-    return cpu;
+    return env ? cpu : NULL;
 }
 
 void cpu_exec_init(CPUArchState *env)