Commit e8729c15 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/input-20180618-pull-request' into staging 



input: ps2 post_load fix.

# gpg: Signature made Mon 18 Jun 2018 11:18:30 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/input-20180618-pull-request:
  ps2: check PS2Queue wptr pointer in post_load routine

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 59926de9 b55a06df

hw/input/ps2.c

+1 −1
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ static void ps2_common_post_load(PS2State *s) 


    /* reset rptr/wptr/count */

    q->rptr = 0;

    q->wptr = size;

    q->wptr = (size == PS2_QUEUE_SIZE) ? 0 : size;

    q->count = size;

    s->update_irq(s->update_arg, q->count != 0);

}