Revision 78971d57 hw/slavio_intctl.c

b/hw/slavio_intctl.c
409 409
    }
410 410
};
411 411

  
412
static void slavio_intctl_reset(void *opaque)
412
static void slavio_intctl_reset(DeviceState *d)
413 413
{
414
    SLAVIO_INTCTLState *s = opaque;
414
    SLAVIO_INTCTLState *s = container_of(d, SLAVIO_INTCTLState, busdev.qdev);
415 415
    int i;
416 416

  
417 417
    for (i = 0; i < MAX_CPUS; i++) {
......
446 446
        s->slaves[i].cpu = i;
447 447
        s->slaves[i].master = s;
448 448
    }
449
    vmstate_register(-1, &vmstate_intctl, s);
450
    qemu_register_reset(slavio_intctl_reset, s);
451
    slavio_intctl_reset(s);
449

  
450
    slavio_intctl_reset(&s->busdev.qdev);
451

  
452 452
    return 0;
453 453
}
454 454

  
......
456 456
    .init = slavio_intctl_init1,
457 457
    .qdev.name  = "slavio_intctl",
458 458
    .qdev.size  = sizeof(SLAVIO_INTCTLState),
459
    .qdev.vmsd  = &vmstate_intctl,
460
    .qdev.reset = slavio_intctl_reset,
459 461
};
460 462

  
461 463
static void slavio_intctl_register_devices(void)

Also available in: Unified diff