Paolo Bonzini <pbonz...@redhat.com> wrote: > Also, for consistency with other occurrences, implement VMSTATE_TIMER > as a special case of VMSTATE_TIMER_V rather than VMSTATE_TIMER_TEST. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > vmstate.h | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/vmstate.h b/vmstate.h > index 5bd2b76..092f21d 100644 > --- a/vmstate.h > +++ b/vmstate.h > @@ -503,8 +503,11 @@ extern const VMStateInfo vmstate_info_unused_buffer; > #define VMSTATE_TIMER_TEST(_f, _s, _test) \ > VMSTATE_POINTER_TEST(_f, _s, _test, vmstate_info_timer, QEMUTimer *) > > +#define VMSTATE_TIMER_V(_f, _s, _v) \ > + VMSTATE_POINTER(_f, _s, _v, vmstate_info_timer, QEMUTimer *) > + > #define VMSTATE_TIMER(_f, _s) \ > - VMSTATE_TIMER_TEST(_f, _s, NULL) > + VMSTATE_POINTER(_f, _s, 0, vmstate_info_timer, QEMUTimer *)
You didn't did it, it should be something like: #define VMSTATE_TIMER(_f, _s) \ - VMSTATE_TIMER_TEST(_f, _s, NULL) + VMSTATE_TIMER_V(_f, _s, 0) > > #define VMSTATE_TIMER_ARRAY(_f, _s, _n) \ > VMSTATE_ARRAY_OF_POINTER(_f, _s, _n, 0, vmstate_info_timer, QEMUTimer *)