commit ce5232c5c281552039466be5eadf93a712eb7611
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 28 17:14:10 2008 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed May 28 17:14:10 2008 +0000
tree 4f39afe8e12ef9743d4bb9ba11f80c4358b76bf4
parent d377440d7401bec1b61d12f2103df378eea995e1

moved halted field to CPU_COMMON

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4609 c046a42c-6fe2-441c-8c8c-71466251a162

hw/apic.c

diff --git a/hw/apic.c b/hw/apic.c
index a1ebf21..6fd0160 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -443,12 +443,12 @@
 static void apic_startup(APICState *s, int vector_num)
 {
     CPUState *env = s->cpu_env;
-    if (!(env->hflags & HF_HALTED_MASK))
+    if (!env->halted)
         return;
     env->eip = 0;
     cpu_x86_load_seg_cache(env, R_CS, vector_num << 8, vector_num << 12,
                            0xffff, 0);
-    env->hflags &= ~HF_HALTED_MASK;
+    env->halted = 0;
 }
 
 static void apic_deliver(APICState *s, uint8_t dest, uint8_t dest_mode,