Commit ad49ff9de3f15d1b91416ecd005cfae16aba0026
1 parent
15a76449
use HF_HALTED bit
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1650 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
2 additions
and
2 deletions
hw/pc.c
| @@ -594,7 +594,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, | @@ -594,7 +594,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, | ||
| 594 | for(i = 0; i < smp_cpus; i++) { | 594 | for(i = 0; i < smp_cpus; i++) { |
| 595 | env = cpu_init(); | 595 | env = cpu_init(); |
| 596 | if (i != 0) | 596 | if (i != 0) |
| 597 | - env->cpu_halted = 1; | 597 | + env->hflags |= HF_HALTED_MASK; |
| 598 | if (smp_cpus > 1) { | 598 | if (smp_cpus > 1) { |
| 599 | /* XXX: enable it in all cases */ | 599 | /* XXX: enable it in all cases */ |
| 600 | env->cpuid_features |= CPUID_APIC; | 600 | env->cpuid_features |= CPUID_APIC; |
monitor.c
| @@ -253,7 +253,7 @@ static void do_info_cpus(void) | @@ -253,7 +253,7 @@ static void do_info_cpus(void) | ||
| 253 | env->cpu_index); | 253 | env->cpu_index); |
| 254 | #if defined(TARGET_I386) | 254 | #if defined(TARGET_I386) |
| 255 | term_printf(" pc=0x" TARGET_FMT_lx, env->eip + env->segs[R_CS].base); | 255 | term_printf(" pc=0x" TARGET_FMT_lx, env->eip + env->segs[R_CS].base); |
| 256 | - if (env->cpu_halted) | 256 | + if (env->hflags & HF_HALTED_MASK) |
| 257 | term_printf(" (halted)"); | 257 | term_printf(" (halted)"); |
| 258 | #endif | 258 | #endif |
| 259 | term_printf("\n"); | 259 | term_printf("\n"); |