Re: [Qemu-devel] [PATCH 4/4] vmstate: accept QEMUTimer in VMSTATE_TIMER*, add VMSTATE_TIMER_PTR*

[Paolo Bonzini <pbonzini@redhat.com>]

On 15/01/2015 10:04, Amit Shah wrote:
> 
>> > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
>> > index e45fc49..55ba584 100644
>> > --- a/include/migration/vmstate.h
>> > +++ b/include/migration/vmstate.h
>> > @@ -642,17 +642,29 @@ extern const VMStateInfo vmstate_info_bitmap;
>> >  #define VMSTATE_FLOAT64(_f, _s)                                       \
>> >      VMSTATE_FLOAT64_V(_f, _s, 0)
>> >  
>> > -#define VMSTATE_TIMER_TEST(_f, _s, _test)                             \
>> > +#define VMSTATE_TIMER_PTR_TEST(_f, _s, _test)                             \
>> >      VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *)
>> >  
>> > -#define VMSTATE_TIMER_V(_f, _s, _v)                                   \
>> > +#define VMSTATE_TIMER_PTR_V(_f, _s, _v)                                   \
>> >      VMSTATE_POINTER(_f, _s, _v, vmstate_info_timer, QEMUTimer *)
>> >  
>> > +#define VMSTATE_TIMER_PTR(_f, _s)                                         \
>> > +    VMSTATE_TIMER_PTR_V(_f, _s, 0)
>> > +
>> > +#define VMSTATE_TIMER_PTR_ARRAY(_f, _s, _n)                              \
>> > +    VMSTATE_ARRAY_OF_POINTER(_f, _s, _n, 0, vmstate_info_timer, QEMUTimer *)
>> > +
>> > +#define VMSTATE_TIMER_TEST(_f, _s, _test)                             \
>> > +    VMSTATE_SINGLE_TEST(_f, _s, _test, 0, vmstate_info_timer, QEMUTimer)
>> > +
>> > +#define VMSTATE_TIMER_V(_f, _s, _v)                                   \
>> > +    VMSTATE_SINGLE(_f, _s, _v, vmstate_info_timer, QEMUTimer)
>> > +
>> >  #define VMSTATE_TIMER(_f, _s)                                         \
>> >      VMSTATE_TIMER_V(_f, _s, 0)
> Why leave this around?

Because further changes down the line will convert QEMUTimer* to
QEMUTimer and thus go back to VMSTATE_TIMER.  Having both around avoids
having a single patch with -1000/+1000 diffstat.

Paolo