aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-17 17:12:41 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-17 17:12:41 +0100
commitdf55c7e8c81db4b142ee157bc41d2ba401b8db20 (patch)
tree88d5ae4ec7bfa9538a9acb3455f485090582cd1e /hw
parent3408d5aee0c078074ba547ca5025d350cbaf64b0 (diff)
parent10750ee0d67eeebbf05822b2249969ba05b5ff4b (diff)
downloadqemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.zip
qemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.tar.gz
qemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170717-pull-request' into staging
virtio-gpu migration fix for 2.10 # gpg: Signature made Mon 17 Jul 2017 10:41:49 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # 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-20170717-pull-request: virtio-gpu: skip update cursor in post_load if we don't have one Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/display/virtio-gpu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 0506d2c..6aae147 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -1092,7 +1092,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
dpy_gfx_replace_surface(scanout->con, scanout->ds);
dpy_gfx_update(scanout->con, 0, 0, scanout->width, scanout->height);
- update_cursor(g, &scanout->cursor);
+ if (scanout->cursor.resource_id) {
+ update_cursor(g, &scanout->cursor);
+ }
res->scanout_bitmask |= (1 << i);
}