diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-08 14:23:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-08 14:23:02 +0100 |
| commit | d01beac177d44491d7db8747b79d94e1b53d173b (patch) | |
| tree | ad367c717f9735b33e17a2733db424f39cb366b5 | |
| parent | 3add3f7edccf1526b0a562a294c2749fd7385c15 (diff) | |
| parent | 5bd5c27c7d284d01477c5cc022ce22438c46bf9f (diff) | |
| download | qemu-d01beac177d44491d7db8747b79d94e1b53d173b.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180507-pull-request' into staging
qxl: fix local renderer crash
# gpg: Signature made Mon 07 May 2018 10:52:09 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/vga-20180507-pull-request:
qxl: fix local renderer crash
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/qxl-render.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index e7ac4f8789..c62b9a5e75 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -169,7 +169,8 @@ void qxl_render_update(PCIQXLDevice *qxl) qemu_mutex_lock(&qxl->ssd.lock); - if (!runstate_is_running() || !qxl->guest_primary.commands) { + if (!runstate_is_running() || !qxl->guest_primary.commands || + qxl->mode == QXL_MODE_UNDEFINED) { qxl_render_update_area_unlocked(qxl); qemu_mutex_unlock(&qxl->ssd.lock); return; |