hw/i8254: fix vmstate load
authorPavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
Wed, 10 Mar 2021 10:21:40 +0000 (13:21 +0300)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 16 Mar 2021 18:30:30 +0000 (14:30 -0400)
QEMU timer of channel 0 in i8254 is used to raise irq
at the specified moment of time. This irq can be disabled
with irq_disabled flag. But when vmstate of the pit is
loaded, timer may be rearmed despite the disabled interrupts.
This patch adds irq_disabled flag check to fix that.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-Id: <161537170060.6654.9430112746749476215.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/timer/i8254.c

index c01ee2c72ace229ecbd37a34f3e4685860a5d7c5..c8388ea432421447f5db9944ff7d844b1d6a5190 100644 (file)
@@ -324,7 +324,7 @@ static void pit_post_load(PITCommonState *s)
 {
     PITChannelState *sc = &s->channels[0];
 
-    if (sc->next_transition_time != -1) {
+    if (sc->next_transition_time != -1 && !sc->irq_disabled) {
         timer_mod(sc->irq_timer, sc->next_transition_time);
     } else {
         timer_del(sc->irq_timer);