commit 02e51483341a371b508c1a529782d83064c93596
author Chen Fan <chen.fan.fnst@cn.fujitsu.com> Mon Dec 23 17:04:02 2013 +0800
committer Andreas Färber <afaerber@suse.de> Mon Dec 23 16:30:40 2013 +0100
tree a6f1621cf820f02bb122cf8990293ec9f5689065
parent eb2535f411c2201cd6f79e8d2b4e3f4c5b765729

target-i386: Move apic_state field from CPUX86State to X86CPU

This motion is preparing for refactoring vCPU APIC subsequently.

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>

cpus.c

diff --git a/cpus.c b/cpus.c
index 01d128d..ca4c59f 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1458,12 +1458,11 @@
 
     CPU_FOREACH(cs) {
         X86CPU *cpu = X86_CPU(cs);
-        CPUX86State *env = &cpu->env;
 
-        if (!env->apic_state) {
+        if (!cpu->apic_state) {
             cpu_interrupt(cs, CPU_INTERRUPT_NMI);
         } else {
-            apic_deliver_nmi(env->apic_state);
+            apic_deliver_nmi(cpu->apic_state);
         }
     }
 #elif defined(TARGET_S390X)