diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 14:49:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-22 14:49:37 +0100 |
| commit | 19f377299518d4f68b2b9e983d90bd1382da0460 (patch) | |
| tree | 5a72b9a074b09e1251da791a40608bf4465a9893 /hw/display | |
| parent | 4b4ce6c2b85cadefdd444d9791a96ffdb0377b24 (diff) | |
| parent | 9e5a25f1c209ff51e4b65124a3b76dd3f1b0fb49 (diff) | |
| download | qemu-19f377299518d4f68b2b9e983d90bd1382da0460.zip qemu-19f377299518d4f68b2b9e983d90bd1382da0460.tar.gz qemu-19f377299518d4f68b2b9e983d90bd1382da0460.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display')
| -rw-r--r-- | hw/display/qxl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 93b3518..b540dd6 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -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) { |