Revision 47dc4fa2

b/hw/lm32_boards.c
75 75
                          const char *kernel_cmdline,
76 76
                          const char *initrd_filename, const char *cpu_model)
77 77
{
78
    LM32CPU *cpu;
78 79
    CPULM32State *env;
79 80
    DriveInfo *dinfo;
80 81
    MemoryRegion *address_space_mem =  get_system_memory();
......
101 102
    if (cpu_model == NULL) {
102 103
        cpu_model = "lm32-full";
103 104
    }
104
    env = cpu_init(cpu_model);
105
    cpu = cpu_lm32_init(cpu_model);
106
    env = &cpu->env;
105 107
    reset_info->env = env;
106 108

  
107 109
    reset_info->flash_base = flash_base;
......
163 165
                          const char *kernel_cmdline,
164 166
                          const char *initrd_filename, const char *cpu_model)
165 167
{
168
    LM32CPU *cpu;
166 169
    CPULM32State *env;
167 170
    DriveInfo *dinfo;
168 171
    MemoryRegion *address_space_mem =  get_system_memory();
......
196 199
    if (cpu_model == NULL) {
197 200
        cpu_model = "lm32-full";
198 201
    }
199
    env = cpu_init(cpu_model);
202
    cpu = cpu_lm32_init(cpu_model);
203
    env = &cpu->env;
200 204
    reset_info->env = env;
201 205

  
202 206
    reset_info->flash_base = flash_base;

Also available in: Unified diff