Patchwork [qom-cpu,6/7] xen: Simplify halting of first CPU

login
register
mail settings
Submitter Andreas Färber
Date Dec. 19, 2012, 3:31 p.m.
Message ID <1355931071-22100-7-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/207412/
State New
Headers show

Comments

Andreas Färber - Dec. 19, 2012, 3:31 p.m.
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>
---
 xen-all.c |    4 +---
 1 Datei geändert, 1 Zeile hinzugefügt(+), 3 Zeilen entfernt(-)

Patch

diff --git a/xen-all.c b/xen-all.c
index daf43b9..e87ed7a 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -584,9 +584,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);
     }