Revision 0be71e32 hw/stellaris.c

b/hw/stellaris.c
354 354
    s->opaque[0] = s->opaque[1] = s;
355 355
    s->timer[0] = qemu_new_timer(vm_clock, gptm_tick, &s->opaque[0]);
356 356
    s->timer[1] = qemu_new_timer(vm_clock, gptm_tick, &s->opaque[1]);
357
    register_savevm("stellaris_gptm", -1, 1, gptm_save, gptm_load, s);
357
    register_savevm(&dev->qdev, "stellaris_gptm", -1, 1,
358
                    gptm_save, gptm_load, s);
358 359
    return 0;
359 360
}
360 361

  
......
673 674
                                       ssys_writefn, s);
674 675
    cpu_register_physical_memory(base, 0x00001000, iomemtype);
675 676
    ssys_reset(s);
676
    register_savevm("stellaris_sys", -1, 1, ssys_save, ssys_load, s);
677
    register_savevm(NULL, "stellaris_sys", -1, 1, ssys_save, ssys_load, s);
677 678
    return 0;
678 679
}
679 680

  
......
887 888
    sysbus_init_mmio(dev, 0x1000, iomemtype);
888 889
    /* ??? For now we only implement the master interface.  */
889 890
    stellaris_i2c_reset(s);
890
    register_savevm("stellaris_i2c", -1, 1,
891
    register_savevm(&dev->qdev, "stellaris_i2c", -1, 1,
891 892
                    stellaris_i2c_save, stellaris_i2c_load, s);
892 893
    return 0;
893 894
}
......
1196 1197
    sysbus_init_mmio(dev, 0x1000, iomemtype);
1197 1198
    stellaris_adc_reset(s);
1198 1199
    qdev_init_gpio_in(&dev->qdev, stellaris_adc_trigger, 1);
1199
    register_savevm("stellaris_adc", -1, 1,
1200
    register_savevm(&dev->qdev, "stellaris_adc", -1, 1,
1200 1201
                    stellaris_adc_save, stellaris_adc_load, s);
1201 1202
    return 0;
1202 1203
}
......
1256 1257
    s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1");
1257 1258
    qdev_init_gpio_in(&dev->qdev, stellaris_ssi_bus_select, 1);
1258 1259

  
1259
    register_savevm("stellaris_ssi_bus", -1, 1,
1260
    register_savevm(&dev->qdev, "stellaris_ssi_bus", -1, 1,
1260 1261
                    stellaris_ssi_bus_save, stellaris_ssi_bus_load, s);
1261 1262
    return 0;
1262 1263
}

Also available in: Unified diff