Revision 61dcd775

b/target-i386/cpu.c
905 905
    }
906 906
}
907 907

  
908
int cpu_x86_register (CPUX86State *env, const char *cpu_model)
908
int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
909 909
{
910
    CPUX86State *env = &cpu->env;
910 911
    x86_def_t def1, *def = &def1;
911 912

  
912 913
    memset(def, 0, sizeof(*def));
b/target-i386/cpu.h
901 901
void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
902 902
                   uint32_t *eax, uint32_t *ebx,
903 903
                   uint32_t *ecx, uint32_t *edx);
904
int cpu_x86_register (CPUX86State *env, const char *cpu_model);
904
int cpu_x86_register(X86CPU *cpu, const char *cpu_model);
905 905
void cpu_clear_apic_feature(CPUX86State *env);
906 906
void host_cpuid(uint32_t function, uint32_t count,
907 907
                uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
b/target-i386/helper.c
1176 1176
            cpu_set_debug_excp_handler(breakpoint_handler);
1177 1177
#endif
1178 1178
    }
1179
    if (cpu_x86_register(env, cpu_model) < 0) {
1179
    if (cpu_x86_register(cpu, cpu_model) < 0) {
1180 1180
        object_delete(OBJECT(cpu));
1181 1181
        return NULL;
1182 1182
    }

Also available in: Unified diff