openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sparc32: convert slavio_timer to reset + vmsd 

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-10-24 17:35:13 +00:00
parent 2be3783328
commit 0e0bfeea68
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/slavio_timer.c
View File

@ -362,9 +362,9 @@ static const VMStateDescription vmstate_slavio_timer = {
} }
}; };
static void slavio_timer_reset(void *opaque) static void slavio_timer_reset(DeviceState *d)
{ {
SLAVIO_TIMERState *s = opaque; SLAVIO_TIMERState *s = container_of(d, SLAVIO_TIMERState, busdev.qdev);
unsigned int i; unsigned int i;
CPUTimerState *curr_timer; CPUTimerState *curr_timer;
@ -411,9 +411,8 @@ static int slavio_timer_init1(SysBusDevice *dev)
sysbus_init_irq(dev, &s->cputimer[i].irq); sysbus_init_irq(dev, &s->cputimer[i].irq);
} }
vmstate_register(-1, &vmstate_slavio_timer, s); slavio_timer_reset(&s->busdev.qdev);
qemu_register_reset(slavio_timer_reset, s);
slavio_timer_reset(s);
return 0; return 0;
} }
@ -421,6 +420,8 @@ static SysBusDeviceInfo slavio_timer_info = {
.init = slavio_timer_init1, .init = slavio_timer_init1,
.qdev.name = "slavio_timer", .qdev.name = "slavio_timer",
.qdev.size = sizeof(SLAVIO_TIMERState), .qdev.size = sizeof(SLAVIO_TIMERState),
.qdev.vmsd = &vmstate_slavio_timer,
.qdev.reset = slavio_timer_reset,
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
DEFINE_PROP_UINT32("num_cpus", SLAVIO_TIMERState, num_cpus, 0), DEFINE_PROP_UINT32("num_cpus", SLAVIO_TIMERState, num_cpus, 0),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),