diff options
| author | Peter Maydell | 2017-07-17 18:12:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-17 18:12:41 +0200 |
| commit | df55c7e8c81db4b142ee157bc41d2ba401b8db20 (patch) | |
| tree | 88d5ae4ec7bfa9538a9acb3455f485090582cd1e /hw | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170717-pull-request' i... (diff) | |
| parent | virtio-gpu: skip update cursor in post_load if we don't have one (diff) | |
| download | qemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.tar.gz qemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.tar.xz qemu-df55c7e8c81db4b142ee157bc41d2ba401b8db20.zip | |
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 0506d2c1b0..6aae147324 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); } |