diff --git a/hw/pc.c b/hw/pc.c
index 33d2219630..b930e4053e 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -594,7 +594,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     for(i = 0; i < smp_cpus; i++) {
         env = cpu_init();
         if (i != 0)
-            env->cpu_halted = 1;
+            env->hflags |= HF_HALTED_MASK;
         if (smp_cpus > 1) {
             /* XXX: enable it in all cases */
             env->cpuid_features |= CPUID_APIC;
diff --git a/monitor.c b/monitor.c
index 85a997db86..9befd82b06 100644
--- a/monitor.c
+++ b/monitor.c
@@ -253,7 +253,7 @@ static void do_info_cpus(void)
                     env->cpu_index);
 #if defined(TARGET_I386)
         term_printf(" pc=0x" TARGET_FMT_lx, env->eip + env->segs[R_CS].base);
-        if (env->cpu_halted)
+        if (env->hflags & HF_HALTED_MASK)
             term_printf(" (halted)");
 #endif
         term_printf("\n");