diff options
| author | Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> | 2021-03-10 13:21:40 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-16 14:30:30 -0400 |
| commit | c963fee4b0a98e48c12ed5b063fc4aba6d018ffb (patch) | |
| tree | 384410421446e8e5046964c5ff9ebf28e3d1df3d /hw/timer | |
| parent | dc293f60b02ff9a4d51ccae153b1685cc8a34d79 (diff) | |
| download | qemu-c963fee4b0a98e48c12ed5b063fc4aba6d018ffb.zip qemu-c963fee4b0a98e48c12ed5b063fc4aba6d018ffb.tar.gz qemu-c963fee4b0a98e48c12ed5b063fc4aba6d018ffb.tar.bz2 | |
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>
Diffstat (limited to 'hw/timer')
| -rw-r--r-- | hw/timer/i8254.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index c01ee2c..c8388ea 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); |