Revision c68ea704 hw/sun4m.c

b/hw/sun4m.c
210 210
    slavio_set_power_fail(slavio_misc, 1);
211 211
}
212 212

  
213
static void main_cpu_reset(void *opaque)
214
{
215
    CPUState *env = opaque;
216
    cpu_reset(env);
217
}
218

  
213 219
/* Sun4m hardware initialisation */
214 220
static void sun4m_init(int ram_size, int vga_ram_size, int boot_device,
215 221
                       DisplayState *ds, const char **fd_filename, int snapshot,
216 222
                       const char *kernel_filename, const char *kernel_cmdline,
217 223
                       const char *initrd_filename)
218 224
{
225
    CPUState *env;
219 226
    char buf[1024];
220 227
    int ret, linux_boot;
221 228
    unsigned int i;
......
223 230

  
224 231
    linux_boot = (kernel_filename != NULL);
225 232

  
233
    env = cpu_init();
234
    register_savevm("cpu", 0, 3, cpu_save, cpu_load, env);
235
    qemu_register_reset(main_cpu_reset, env);
236

  
226 237
    /* allocate RAM */
227 238
    cpu_register_physical_memory(0, ram_size, 0);
228 239

  

Also available in: Unified diff