summary refs log tree commit diff stats
path: root/ui/console.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2016-04-01 10:27:20 +0200
committerGerd Hoffmann <kraxel@redhat.com>2016-04-11 12:32:01 +0200
commitca58b45fbee05ef7ed938abc5308548866335937 (patch)
tree0ec21105a310f00c14386d00b0434fd17fa25a0a /ui/console.c
parent9628af036fade986dcc94f4484bc75c6b1a06d84 (diff)
downloadfocaccia-qemu-ca58b45fbee05ef7ed938abc5308548866335937.tar.gz
focaccia-qemu-ca58b45fbee05ef7ed938abc5308548866335937.zip
ui/virtio-gpu: add and use qemu_create_displaysurface_pixman
Add a the new qemu_create_displaysurface_pixman function, to create
a DisplaySurface backed by an existing pixman image.  In that case
there is no need to create a new pixman image pointing to the same
backing storage.  We can just use the existing image directly.

This does not only simplify things a bit, but most importantly it
gets the reference counting right, so the backing storage for the
pixman image wouldn't be released underneath us.

Use new function in virtio-gpu, where using it actually fixes
use-after-free crashes.

Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1459499240-742-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'ui/console.c')
-rw-r--r--ui/console.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/ui/console.c b/ui/console.c
index 1fd4ea4d2e..bf385790b5 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1292,6 +1292,17 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height,
     return surface;
 }
 
+DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)
+{
+    DisplaySurface *surface = g_new0(DisplaySurface, 1);
+
+    trace_displaysurface_create_pixman(surface);
+    surface->format = pixman_image_get_format(image);
+    surface->image = pixman_image_ref(image);
+
+    return surface;
+}
+
 static void qemu_unmap_displaysurface_guestmem(pixman_image_t *image,
                                                void *unused)
 {