On 7 June 2018 at 18:17, Mark Cave-Ayland <[email protected]> wrote: > The timers are configured in the mos6522 init function and therefore will > always exist, so the function can never return false. > > Peter also pointed out that this is the only remaining user of > VMSTATE_TIMER_PTR_TEST in the codebase, so we might as well just convert it > over to VMSTATE_TIMER_PTR and remove mos6522_timer_exist() as it is no > longer required. > > Signed-off-by: Mark Cave-Ayland <[email protected]> > --- > hw/misc/mos6522.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c > index d0a0c9e5d9..e9b686ac92 100644 > --- a/hw/misc/mos6522.c > +++ b/hw/misc/mos6522.c > @@ -369,13 +369,6 @@ static const MemoryRegionOps mos6522_ops = { > }, > }; > > -static bool mos6522_timer_exist(void *opaque, int version_id) > -{ > - MOS6522Timer *s = opaque; > - > - return s->timer != NULL; > -} > - > static const VMStateDescription vmstate_mos6522_timer = { > .name = "mos6522_timer", > .version_id = 0, > @@ -385,7 +378,7 @@ static const VMStateDescription vmstate_mos6522_timer = { > VMSTATE_UINT16(counter_value, MOS6522Timer), > VMSTATE_INT64(load_time, MOS6522Timer), > VMSTATE_INT64(next_irq_time, MOS6522Timer), > - VMSTATE_TIMER_PTR_TEST(timer, MOS6522Timer, mos6522_timer_exist), > + VMSTATE_TIMER_PTR(timer, MOS6522Timer), > VMSTATE_END_OF_LIST() > } Reviewed-by: Peter Maydell <[email protected]>
thanks -- PMM
