From: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
Date: Wed, 10 Mar 2021 10:21:40 +0000 (+0300)
Subject: hw/i8254: fix vmstate load
X-Git-Tag: v6.0.0-rc0~25^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c963fee4b0a98e48c12ed5b063fc4aba6d018ffb;p=thirdparty%2Fqemu.git

hw/i8254: fix vmstate load

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>
---

diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c
index c01ee2c72ac..c8388ea4324 100644
--- a/hw/timer/i8254.c
+++ b/hw/timer/i8254.c
@@ -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);