Commit 19f37729 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20141015-1' into staging 



qxl: keep going if reaching guest bug on empty area

# gpg: Signature made Wed 15 Oct 2014 11:45:37 BST using RSA key ID D3E87138
# 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>"

* remotes/spice/tags/pull-spice-20141015-1:
  qxl: keep going if reaching guest bug on empty area

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4b4ce6c2 9e5a25f1

hw/display/qxl.c

+5 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,11 @@ async_common: 
            qxl_set_guest_bug(d,

                    "QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n",

                    update.left, update.top, update.right, update.bottom);

            if (update.left == update.right || update.top == update.bottom) {

                /* old drivers may provide empty area, keep going */

                qxl_clear_guest_bug(d);

                goto cancel_async;

            }

            break;

        }

        if (async == QXL_ASYNC) {