Changeset
hw/display/virtio-gpu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Git apply log
Switched to a new branch '20170717094159.16447-1-kraxel@redhat.com'
Applying: virtio-gpu: skip update cursor in post_load if we don't have one
To https://github.com/patchew-project/qemu
 * [new tag]         patchew/20170717094159.16447-1-kraxel@redhat.com -> patchew/20170717094159.16447-1-kraxel@redhat.com
Test passed: FreeBSD

loading

Test passed: s390x

loading

Test passed: docker

loading

Test passed: checkpatch

loading

[Qemu-devel] [PULL 0/1] Vga 20170717 patches
Posted by Gerd Hoffmann, 52 weeks ago
The following changes since commit 6e2c46334385c7e295ac883c801c81b4925fb54f:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170711' into staging (2017-07-13 10:47:10 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/vga-20170717-pull-request

for you to fetch changes up to 10750ee0d67eeebbf05822b2249969ba05b5ff4b:

  virtio-gpu: skip update cursor in post_load if we don't have one (2017-07-17 11:41:23 +0200)

----------------------------------------------------------------
virtio-gpu migration fix for 2.10

----------------------------------------------------------------

Gerd Hoffmann (1):
  virtio-gpu: skip update cursor in post_load if we don't have one

 hw/display/virtio-gpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.9.3


Re: [Qemu-devel] [PULL 0/1] Vga 20170717 patches
Posted by Peter Maydell, 52 weeks ago
On 17 July 2017 at 10:41, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit 6e2c46334385c7e295ac883c801c81b4925fb54f:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170711' into staging (2017-07-13 10:47:10 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20170717-pull-request
>
> for you to fetch changes up to 10750ee0d67eeebbf05822b2249969ba05b5ff4b:
>
>   virtio-gpu: skip update cursor in post_load if we don't have one (2017-07-17 11:41:23 +0200)
>
> ----------------------------------------------------------------
> virtio-gpu migration fix for 2.10
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (1):
>   virtio-gpu: skip update cursor in post_load if we don't have one
>
>  hw/display/virtio-gpu.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 1/1] virtio-gpu: skip update cursor in post_load if we don't have one
Posted by Gerd Hoffmann, 52 weeks ago
If the cursor resource id isn't set the guest didn't define a cursor.
Skip the cursor update in post_load in that that case.

Reported-by: wanghaibin <wanghaibin.wang@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: wanghaibin <wanghaibin.wang@huawei.com>
Message-id: 20170710070432.856-1-kraxel@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/virtio-gpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
     }
 
-- 
2.9.3