diff options
author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-28 17:14:10 +0000 |
---|---|---|
committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-28 17:14:10 +0000 |
commit | ce5232c5c281552039466be5eadf93a712eb7611 (patch) | |
tree | 4f39afe8e12ef9743d4bb9ba11f80c4358b76bf4 /hw | |
parent | d377440d7401bec1b61d12f2103df378eea995e1 (diff) | |
download | hqemu-ce5232c5c281552039466be5eadf93a712eb7611.zip hqemu-ce5232c5c281552039466be5eadf93a712eb7611.tar.gz |
moved halted field to CPU_COMMON
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4609 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r-- | hw/apic.c | 4 | ||||
-rw-r--r-- | hw/pc.c | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -443,12 +443,12 @@ static void apic_init_ipi(APICState *s) 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, @@ -761,7 +761,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, exit(1); } if (i != 0) - env->hflags |= HF_HALTED_MASK; + env->halted = 1; if (smp_cpus > 1) { /* XXX: enable it in all cases */ env->cpuid_features |= CPUID_APIC; |