From: Andreas Färber <afaerber@suse.de>
Date: Mon, 17 Dec 2012 18:39:30 +0000 (+0100)
Subject: xen: Simplify halting of first CPU
X-Git-Tag: v1.4.0-rc0~181^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4a1e40b5091bcff5f8ea3fe9963eaa8e76b16389;p=users%2Fdwmw2%2Fqemu.git

xen: Simplify halting of first CPU

Use the global first_cpu variable to halt the CPU rather than using a
local first_cpu initialized from qemu_get_cpu(0).

This will allow to change qemu_get_cpu() return type to CPUState
despite use of the CPU_COMMON halted field in the reset handler.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/xen-all.c b/xen-all.c
index 19bcfd1510..110f958a53 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -585,9 +585,7 @@ static void xen_reset_vcpu(void *opaque)
 
 void xen_vcpu_init(void)
 {
-    CPUArchState *first_cpu;
-
-    if ((first_cpu = qemu_get_cpu(0))) {
+    if (first_cpu != NULL) {
         qemu_register_reset(xen_reset_vcpu, first_cpu);
         xen_reset_vcpu(first_cpu);
     }