[PULL 10/11] ui: fold qemu_alloc_display in only caller

From: Marc-André Lureau <marcandre.lureau(a)redhat.com&gt; A minor code simplification. Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com&gt; Message-Id: <20210312100108.2706195-2-marcandre.lureau(a)redhat.com&gt; Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com&gt; --- ui/console.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ui/console.c b/ui/console.c index c2fdf975b6b3..2de5f4105b59 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1386,26 +1386,18 @@ static QemuConsole *new_console(DisplayState *ds, console_type_t console_type, return s; } -static void qemu_alloc_display(DisplaySurface *surface, int width, int height) +DisplaySurface *qemu_create_displaysurface(int width, int height) { - qemu_pixman_image_unref(surface->image); - surface->image = NULL; + DisplaySurface *surface = g_new0(DisplaySurface, 1); + trace_displaysurface_create(surface, width, height); surface->format = PIXMAN_x8r8g8b8; surface->image = pixman_image_create_bits(surface->format, width, height, NULL, width * 4); assert(surface->image != NULL); - surface->flags = QEMU_ALLOCATED_FLAG; -} -DisplaySurface *qemu_create_displaysurface(int width, int height) -{ - DisplaySurface *surface = g_new0(DisplaySurface, 1); - - trace_displaysurface_create(surface, width, height); - qemu_alloc_display(surface, width, height); return surface; } -- 2.29.2