{"id":2229377,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229377/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260428081303.990973-3-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260428081303.990973-3-marcandre.lureau@redhat.com>","date":"2026-04-28T08:12:49","name":"[PULL,02/15] ui: move DisplaySurface functions to display-surface.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1405d6db5771cddf8ba57a154c568ef13d341e0e","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/1.1/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260428081303.990973-3-marcandre.lureau@redhat.com/mbox/","series":[{"id":501785,"url":"http://patchwork.ozlabs.org/api/1.1/series/501785/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501785","date":"2026-04-28T08:12:48","name":"[PULL,01/15] ui: move FONT_WIDTH/HEIGHT to vgafont.h","version":1,"mbox":"http://patchwork.ozlabs.org/series/501785/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229377/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229377/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=FAc2VV9L;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4Y9R5lD1z1xvV\n\tfor ; Tue, 28 Apr 2026 18:13:47 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHdZS-0005uE-4M; Tue, 28 Apr 2026 04:13:30 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHdZQ-0005tN-IQ\n for qemu-devel@nongnu.org; Tue, 28 Apr 2026 04:13:28 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHdZO-0005nd-F4\n for qemu-devel@nongnu.org; Tue, 28 Apr 2026 04:13:28 -0400","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-YdsvrIshPRe7q6_5PGN0GA-1; Tue,\n 28 Apr 2026 04:13:22 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 445E01800605; Tue, 28 Apr 2026 08:13:21 +0000 (UTC)","from localhost (unknown [10.44.24.6])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id F241E180047F; Tue, 28 Apr 2026 08:13:19 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777364005;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=/PujuF2PwJndAYCY+IHOvOEQ/FdCeDUOkyw1iu1Rcpk=;\n b=FAc2VV9LOO9vPBAZvIF+5pZFDWaEsIih7N5adiE+ceMkaHDXyZjlBfpUv3mirA6BlRYCzA\n NE/KGWR0bFiAVa6neKEIfSyf1FcjOMvk4Rh+fgkI97wWQrENkCN0sks5S/BiRNIToWP52U\n rWe6QGiD7Vk+JOOYpE9Evii0GLzd/qU=","X-MC-Unique":"YdsvrIshPRe7q6_5PGN0GA-1","X-Mimecast-MFC-AGG-ID":"YdsvrIshPRe7q6_5PGN0GA_1777364001","From":"marcandre.lureau@redhat.com","To":"qemu-devel@nongnu.org","Cc":"peter.maydell@linaro.org,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Subject":"[PULL 02/15] ui: move DisplaySurface functions to display-surface.c","Date":"Tue, 28 Apr 2026 12:12:49 +0400","Message-ID":"<20260428081303.990973-3-marcandre.lureau@redhat.com>","In-Reply-To":"<20260428081303.990973-1-marcandre.lureau@redhat.com>","References":"<20260428081303.990973-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Marc-André Lureau \n\nExtract DisplaySurface creation and destruction functions from console.c\ninto their own file to reduce the size of console.c and improve code\norganization.\n\nReviewed-by: Philippe Mathieu-Daudé \nSigned-off-by: Marc-André Lureau \n---\n ui/console.c | 96 --------------------------------------\n ui/display-surface.c | 107 +++++++++++++++++++++++++++++++++++++++++++\n ui/meson.build | 1 +\n 3 files changed, 108 insertions(+), 96 deletions(-)\n create mode 100644 ui/display-surface.c","diff":"diff --git a/ui/console.c b/ui/console.c\nindex 9606da7b1a6..475a72aa08f 100644\n--- a/ui/console.c\n+++ b/ui/console.c\n@@ -505,102 +505,6 @@ qemu_graphic_console_init(Object *obj)\n {\n }\n \n-void qemu_displaysurface_set_share_handle(DisplaySurface *surface,\n- qemu_pixman_shareable handle,\n- uint32_t offset)\n-{\n- assert(surface->share_handle == SHAREABLE_NONE);\n-\n- surface->share_handle = handle;\n- surface->share_handle_offset = offset;\n-\n-}\n-\n-DisplaySurface *qemu_create_displaysurface(int width, int height)\n-{\n- trace_displaysurface_create(width, height);\n-\n- return qemu_create_displaysurface_from(\n- width, height,\n- PIXMAN_x8r8g8b8,\n- width * 4, NULL\n- );\n-}\n-\n-DisplaySurface *qemu_create_displaysurface_from(int width, int height,\n- pixman_format_code_t format,\n- int linesize, uint8_t *data)\n-{\n- DisplaySurface *surface = g_new0(DisplaySurface, 1);\n-\n- trace_displaysurface_create_from(surface, width, height, format);\n- surface->share_handle = SHAREABLE_NONE;\n-\n- if (data) {\n- surface->image = pixman_image_create_bits(format,\n- width, height,\n- (void *)data, linesize);\n- } else {\n- qemu_pixman_image_new_shareable(&surface->image,\n- &surface->share_handle,\n- \"displaysurface\",\n- format,\n- width,\n- height,\n- linesize,\n- &error_abort);\n- surface->flags = QEMU_ALLOCATED_FLAG;\n- }\n-\n- assert(surface->image != NULL);\n- return surface;\n-}\n-\n-DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)\n-{\n- DisplaySurface *surface = g_new0(DisplaySurface, 1);\n-\n- trace_displaysurface_create_pixman(surface);\n- surface->share_handle = SHAREABLE_NONE;\n- surface->image = pixman_image_ref(image);\n-\n- return surface;\n-}\n-\n-DisplaySurface *qemu_create_placeholder_surface(int w, int h,\n- const char *msg)\n-{\n- DisplaySurface *surface = qemu_create_displaysurface(w, h);\n-#ifdef CONFIG_PIXMAN\n- pixman_color_t bg = QEMU_PIXMAN_COLOR_BLACK;\n- pixman_color_t fg = QEMU_PIXMAN_COLOR_GRAY;\n- pixman_image_t *glyph;\n- int len, x, y, i;\n-\n- len = strlen(msg);\n- x = (w / FONT_WIDTH - len) / 2;\n- y = (h / FONT_HEIGHT - 1) / 2;\n- for (i = 0; i < len; i++) {\n- glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, msg[i]);\n- qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg,\n- x+i, y, FONT_WIDTH, FONT_HEIGHT);\n- qemu_pixman_image_unref(glyph);\n- }\n-#endif\n- surface->flags |= QEMU_PLACEHOLDER_FLAG;\n- return surface;\n-}\n-\n-void qemu_free_displaysurface(DisplaySurface *surface)\n-{\n- if (surface == NULL) {\n- return;\n- }\n- trace_displaysurface_free(surface);\n- qemu_pixman_image_unref(surface->image);\n- g_free(surface);\n-}\n-\n bool console_has_gl(QemuConsole *con)\n {\n return con->gl != NULL;\ndiff --git a/ui/display-surface.c b/ui/display-surface.c\nnew file mode 100644\nindex 00000000000..38e408513cc\n--- /dev/null\n+++ b/ui/display-surface.c\n@@ -0,0 +1,107 @@\n+/*\n+ * QEMU graphical console surface helper\n+ *\n+ * Copyright (c) 2004 Fabrice Bellard\n+ *\n+ * SPDX-License-Identifier: MIT\n+ */\n+#include \"qemu/osdep.h\"\n+#include \"ui/console.h\"\n+#include \"ui/vgafont.h\"\n+#include \"trace.h\"\n+\n+void qemu_displaysurface_set_share_handle(DisplaySurface *surface,\n+ qemu_pixman_shareable handle,\n+ uint32_t offset)\n+{\n+ assert(surface->share_handle == SHAREABLE_NONE);\n+\n+ surface->share_handle = handle;\n+ surface->share_handle_offset = offset;\n+\n+}\n+\n+DisplaySurface *qemu_create_displaysurface(int width, int height)\n+{\n+ trace_displaysurface_create(width, height);\n+\n+ return qemu_create_displaysurface_from(\n+ width, height,\n+ PIXMAN_x8r8g8b8,\n+ width * 4, NULL\n+ );\n+}\n+\n+DisplaySurface *qemu_create_displaysurface_from(int width, int height,\n+ pixman_format_code_t format,\n+ int linesize, uint8_t *data)\n+{\n+ DisplaySurface *surface = g_new0(DisplaySurface, 1);\n+\n+ trace_displaysurface_create_from(surface, width, height, format);\n+ surface->share_handle = SHAREABLE_NONE;\n+\n+ if (data) {\n+ surface->image = pixman_image_create_bits(format,\n+ width, height,\n+ (void *)data, linesize);\n+ } else {\n+ qemu_pixman_image_new_shareable(&surface->image,\n+ &surface->share_handle,\n+ \"displaysurface\",\n+ format,\n+ width,\n+ height,\n+ linesize,\n+ &error_abort);\n+ surface->flags = QEMU_ALLOCATED_FLAG;\n+ }\n+\n+ assert(surface->image != NULL);\n+ return surface;\n+}\n+\n+DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image)\n+{\n+ DisplaySurface *surface = g_new0(DisplaySurface, 1);\n+\n+ trace_displaysurface_create_pixman(surface);\n+ surface->share_handle = SHAREABLE_NONE;\n+ surface->image = pixman_image_ref(image);\n+\n+ return surface;\n+}\n+\n+DisplaySurface *qemu_create_placeholder_surface(int w, int h,\n+ const char *msg)\n+{\n+ DisplaySurface *surface = qemu_create_displaysurface(w, h);\n+#ifdef CONFIG_PIXMAN\n+ pixman_color_t bg = QEMU_PIXMAN_COLOR_BLACK;\n+ pixman_color_t fg = QEMU_PIXMAN_COLOR_GRAY;\n+ pixman_image_t *glyph;\n+ int len, x, y, i;\n+\n+ len = strlen(msg);\n+ x = (w / FONT_WIDTH - len) / 2;\n+ y = (h / FONT_HEIGHT - 1) / 2;\n+ for (i = 0; i < len; i++) {\n+ glyph = qemu_pixman_glyph_from_vgafont(FONT_HEIGHT, vgafont16, msg[i]);\n+ qemu_pixman_glyph_render(glyph, surface->image, &fg, &bg,\n+ x + i, y, FONT_WIDTH, FONT_HEIGHT);\n+ qemu_pixman_image_unref(glyph);\n+ }\n+#endif\n+ surface->flags |= QEMU_PLACEHOLDER_FLAG;\n+ return surface;\n+}\n+\n+void qemu_free_displaysurface(DisplaySurface *surface)\n+{\n+ if (surface == NULL) {\n+ return;\n+ }\n+ trace_displaysurface_free(surface);\n+ qemu_pixman_image_unref(surface->image);\n+ g_free(surface);\n+}\ndiff --git a/ui/meson.build b/ui/meson.build\nindex 4e533d30460..3d15ff96287 100644\n--- a/ui/meson.build\n+++ b/ui/meson.build\n@@ -4,6 +4,7 @@ system_ss.add(files(\n 'clipboard.c',\n 'console.c',\n 'cursor.c',\n+ 'display-surface.c',\n 'dmabuf.c',\n 'input-keymap.c',\n 'input-legacy.c',\n","prefixes":["PULL","02/15"]}