Revision 39bffca2 hw/pl061.c

b/hw/pl061.c
295 295

  
296 296
static void pl061_class_init(ObjectClass *klass, void *data)
297 297
{
298
    DeviceClass *dc = DEVICE_CLASS(klass);
298 299
    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
299 300

  
300 301
    k->init = pl061_init_arm;
302
    dc->vmsd = &vmstate_pl061;
301 303
}
302 304

  
303
static DeviceInfo pl061_info = {
304
    .name = "pl061",
305
    .size = sizeof(pl061_state),
306
    .vmsd = &vmstate_pl061,
307
    .class_init = pl061_class_init,
305
static TypeInfo pl061_info = {
306
    .name          = "pl061",
307
    .parent        = TYPE_SYS_BUS_DEVICE,
308
    .instance_size = sizeof(pl061_state),
309
    .class_init    = pl061_class_init,
308 310
};
309 311

  
310 312
static void pl061_luminary_class_init(ObjectClass *klass, void *data)
311 313
{
314
    DeviceClass *dc = DEVICE_CLASS(klass);
312 315
    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
313 316

  
314 317
    k->init = pl061_init_luminary;
318
    dc->vmsd = &vmstate_pl061;
315 319
}
316 320

  
317
static DeviceInfo pl061_luminary_info = {
318
    .name = "pl061_luminary",
319
    .size = sizeof(pl061_state),
320
    .vmsd = &vmstate_pl061,
321
    .class_init = pl061_luminary_class_init,
321
static TypeInfo pl061_luminary_info = {
322
    .name          = "pl061_luminary",
323
    .parent        = TYPE_SYS_BUS_DEVICE,
324
    .instance_size = sizeof(pl061_state),
325
    .class_init    = pl061_luminary_class_init,
322 326
};
323 327

  
324 328
static void pl061_register_devices(void)
325 329
{
326
    sysbus_register_withprop(&pl061_info);
327
    sysbus_register_withprop(&pl061_luminary_info);
330
    type_register_static(&pl061_info);
331
    type_register_static(&pl061_luminary_info);
328 332
}
329 333

  
330 334
device_init(pl061_register_devices)

Also available in: Unified diff