| Message ID | 1410265809-27247-11-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
Paolo Bonzini <pbonzini@redhat.com> wrote: > From: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> > > This patch adds irq_reinject_on_ack_count field to VMState to allow correct > saving/loading the state of MC146818 RTC. > > Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Juan Quintela <quintela@redhat.com> > --- > hw/timer/mc146818rtc.c | 24 +++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c > index 17912b8..2c4b650 100644 > --- a/hw/timer/mc146818rtc.c > +++ b/hw/timer/mc146818rtc.c > @@ -733,6 +733,22 @@ static int rtc_post_load(void *opaque, int version_id) > return 0; > } > > +static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { > + .name = "irq_reinject_on_ack_count", > + .version_id = 1, > + .minimum_version_id = 1, > + .fields = (VMStateField[]) { > + VMSTATE_UINT16(irq_reinject_on_ack_count, RTCState), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +static bool rtc_irq_reinject_on_ack_count_needed(void *opaque) > +{ > + RTCState *s = (RTCState *)opaque; If you have to resend for any reason, please remove this unneeded cast. > + return s->irq_reinject_on_ack_count != 0; > +} > + > static const VMStateDescription vmstate_rtc = { > .name = "mc146818rtc", > .version_id = 3, > @@ -753,6 +769,14 @@ static const VMStateDescription vmstate_rtc = { > VMSTATE_TIMER_V(update_timer, RTCState, 3), > VMSTATE_UINT64_V(next_alarm_time, RTCState, 3), > VMSTATE_END_OF_LIST() > + }, > + .subsections = (VMStateSubsection[]) { > + { > + .vmsd = &vmstate_rtc_irq_reinject_on_ack_count, > + .needed = rtc_irq_reinject_on_ack_count_needed, > + }, { > + /* empty */ > + } > } > };
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 17912b8..2c4b650 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -733,6 +733,22 @@ static int rtc_post_load(void *opaque, int version_id) return 0; } +static const VMStateDescription vmstate_rtc_irq_reinject_on_ack_count = { + .name = "irq_reinject_on_ack_count", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT16(irq_reinject_on_ack_count, RTCState), + VMSTATE_END_OF_LIST() + } +}; + +static bool rtc_irq_reinject_on_ack_count_needed(void *opaque) +{ + RTCState *s = (RTCState *)opaque; + return s->irq_reinject_on_ack_count != 0; +} + static const VMStateDescription vmstate_rtc = { .name = "mc146818rtc", .version_id = 3, @@ -753,6 +769,14 @@ static const VMStateDescription vmstate_rtc = { VMSTATE_TIMER_V(update_timer, RTCState, 3), VMSTATE_UINT64_V(next_alarm_time, RTCState, 3), VMSTATE_END_OF_LIST() + }, + .subsections = (VMStateSubsection[]) { + { + .vmsd = &vmstate_rtc_irq_reinject_on_ack_count, + .needed = rtc_irq_reinject_on_ack_count_needed, + }, { + /* empty */ + } } };