ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui/pixman: generalize shared_image_destroy 

Learn to free memfd-allocated shared memory.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20241008125028.1177932-10-marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-10-08 16:50:18 +04:00
parent c90204b654
commit 1bfb726112
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/display/virtio-gpu.c
View File

@ -298,7 +298,7 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g,
bits, c2d.height ? res->hostmem / c2d.height : 0); bits, c2d.height ? res->hostmem / c2d.height : 0);
#ifdef WIN32 #ifdef WIN32
if (res->image) { if (res->image) {
pixman_image_set_destroy_function(res->image, qemu_pixman_win32_image_destroy, res->handle); pixman_image_set_destroy_function(res->image, qemu_pixman_shared_image_destroy, res->handle);
} }
#endif #endif
} }
@ -1317,7 +1317,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
return -EINVAL; return -EINVAL;
} }
#ifdef WIN32 #ifdef WIN32
pixman_image_set_destroy_function(res->image, qemu_pixman_win32_image_destroy, res->handle); pixman_image_set_destroy_function(res->image, qemu_pixman_shared_image_destroy, res->handle);
#endif #endif
res->addrs = g_new(uint64_t, res->iov_cnt); res->addrs = g_new(uint64_t, res->iov_cnt);

2
include/ui/qemu-pixman.h
View File

@ -97,7 +97,7 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph,
void qemu_pixman_image_unref(pixman_image_t *image); void qemu_pixman_image_unref(pixman_image_t *image);
void qemu_pixman_win32_image_destroy(pixman_image_t *image, void *data); void qemu_pixman_shared_image_destroy(pixman_image_t *image, void *data);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(pixman_image_t, qemu_pixman_image_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(pixman_image_t, qemu_pixman_image_unref)

2
ui/console.c
View File

@ -487,7 +487,7 @@ DisplaySurface *qemu_create_displaysurface(int width, int height)
#ifdef WIN32 #ifdef WIN32
qemu_displaysurface_win32_set_handle(surface, handle, 0); qemu_displaysurface_win32_set_handle(surface, handle, 0);
pixman_image_set_destroy_function(surface->image, pixman_image_set_destroy_function(surface->image,
qemu_pixman_win32_image_destroy, handle); qemu_pixman_shared_image_destroy, handle);
#endif #endif
return surface; return surface;
} }

20
ui/qemu-pixman.c
View File

@ -6,6 +6,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "ui/console.h" #include "ui/console.h"
#include "qemu/memfd.h"
#include "standard-headers/drm/drm_fourcc.h" #include "standard-headers/drm/drm_fourcc.h"
#include "trace.h" #include "trace.h"
@ -269,16 +270,19 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph,
} }
#endif /* CONFIG_PIXMAN */ #endif /* CONFIG_PIXMAN */
#ifdef WIN32
void void
qemu_pixman_win32_image_destroy(pixman_image_t *image, void *data) qemu_pixman_shared_image_destroy(pixman_image_t *image, void *data)
{ {
void *ptr = pixman_image_get_data(image);
#ifdef WIN32
HANDLE handle = data; HANDLE handle = data;
qemu_win32_map_free( qemu_win32_map_free(ptr, handle, &error_warn);
pixman_image_get_data(image), #else
handle, int shmfd = GPOINTER_TO_INT(data);
&error_warn size_t size = pixman_image_get_height(image) * pixman_image_get_stride(image);
);
} qemu_memfd_free(ptr, size, shmfd);
#endif #endif
}