Revision f8d926e9 target-i386/machine.c

b/target-i386/machine.c
140 140
        qemu_put_be64s(f, &env->mtrr_var[i].base);
141 141
        qemu_put_be64s(f, &env->mtrr_var[i].mask);
142 142
    }
143

  
144
    for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) {
145
        qemu_put_be64s(f, &env->interrupt_bitmap[i]);
146
    }
147
    qemu_put_be64s(f, &env->tsc);
148
    qemu_put_be32s(f, &env->mp_state);
143 149
}
144 150

  
145 151
#ifdef USE_X86LDOUBLE
......
174 180
    uint16_t fpus, fpuc, fptag, fpregs_format;
175 181
    int32_t a20_mask;
176 182

  
177
    if (version_id != 3 && version_id != 4 && version_id != 5
178
        && version_id != 6 && version_id != 7 && version_id != 8)
183
    if (version_id < 3 || version_id > CPU_SAVE_VERSION)
179 184
        return -EINVAL;
180 185
    for(i = 0; i < CPU_NB_REGS; i++)
181 186
        qemu_get_betls(f, &env->regs[i]);
......
319 324
            qemu_get_be64s(f, &env->mtrr_var[i].mask);
320 325
        }
321 326
    }
327
    if (version_id >= 9) {
328
        for (i = 0; i < sizeof(env->interrupt_bitmap)/8; i++) {
329
            qemu_get_be64s(f, &env->interrupt_bitmap[i]);
330
        }
331
        qemu_get_be64s(f, &env->tsc);
332
        qemu_get_be32s(f, &env->mp_state);
333
    }
322 334

  
323 335
    /* XXX: ensure compatiblity for halted bit ? */
324 336
    /* XXX: compute redundant hflags bits */

Also available in: Unified diff