Revision 9656f324 target-i386/machine.c

b/target-i386/machine.c
123 123

  
124 124
    qemu_put_be64s(f, &env->pat);
125 125
    qemu_put_be32s(f, &env->hflags2);
126
    qemu_put_be32s(f, (uint32_t *)&env->halted);
127 126
    
128 127
    qemu_put_be64s(f, &env->vm_hsave);
129 128
    qemu_put_be64s(f, &env->vm_vmcb);
......
169 168
    uint16_t fpus, fpuc, fptag, fpregs_format;
170 169
    int32_t a20_mask;
171 170

  
172
    if (version_id != 3 && version_id != 4 && version_id != 5)
171
    if (version_id != 3 && version_id != 4 && version_id != 5
172
        && version_id != 6)
173 173
        return -EINVAL;
174 174
    for(i = 0; i < CPU_NB_REGS; i++)
175 175
        qemu_get_betls(f, &env->regs[i]);
......
279 279
    if (version_id >= 5) {
280 280
        qemu_get_be64s(f, &env->pat);
281 281
        qemu_get_be32s(f, &env->hflags2);
282
        qemu_get_be32s(f, (uint32_t *)&env->halted);
282
        if (version_id < 6)
283
            qemu_get_be32s(f, &env->halted);
283 284

  
284 285
        qemu_get_be64s(f, &env->vm_hsave);
285 286
        qemu_get_be64s(f, &env->vm_vmcb);

Also available in: Unified diff