{"id":2222097,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222097/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410-qemu-vnc-v2-35-231416f76dc3@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":"<20260410-qemu-vnc-v2-35-231416f76dc3@redhat.com>","date":"2026-04-10T19:18:57","name":"[v2,35/67] ui: move DisplaySurface functions to display-surface.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7caf9fafec9854cbd5aebdaac39cd01e0fcb7b7c","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/20260410-qemu-vnc-v2-35-231416f76dc3@redhat.com/mbox/","series":[{"id":499494,"url":"http://patchwork.ozlabs.org/api/1.1/series/499494/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499494","date":"2026-04-10T19:18:23","name":"ui: add standalone VNC server over D-Bus","version":2,"mbox":"http://patchwork.ozlabs.org/series/499494/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222097/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222097/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=L8Mn3QbV;\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=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.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 4fsmtJ1Rp5z1y2d\n\tfor ; Sat, 11 Apr 2026 05:23:18 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wBHR5-0004qT-BY; Fri, 10 Apr 2026 15:22:35 -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 1wBHR4-0004qF-HZ\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:22:34 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.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 1wBHR2-0001w8-EM\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:22:34 -0400","from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-316-R2EfsumIOjOSDrNkEd6olQ-1; Fri,\n 10 Apr 2026 15:22:28 -0400","from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id CD981195608F; Fri, 10 Apr 2026 19:22:27 +0000 (UTC)","from localhost (unknown [10.44.22.4])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id A9E753000C16; Fri, 10 Apr 2026 19:22:26 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775848951;\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=3LNuPoQo1Zb1a/2wcDI/iPeJu3JZHwmOC/OpCwhaFTQ=;\n b=L8Mn3QbVrMBopm7lAwWYT/Ypg1hU/ErKTCDV5LSyAg/3FingizjGTG3zRwgKDe/8DFfV2E\n 7qnSsnGaP/1tjxU2493Okd4Zt1FCnxfa4nQM4E3Jzj+Zvogu5MMeYVaXCvRgxW7kvmgkXL\n Ll2sV8h8TWS6zQSS9YPcUsjaVzMhDAg=","X-MC-Unique":"R2EfsumIOjOSDrNkEd6olQ-1","X-Mimecast-MFC-AGG-ID":"R2EfsumIOjOSDrNkEd6olQ_1775848947","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Fri, 10 Apr 2026 23:18:57 +0400","Subject":"[PATCH v2 35/67] ui: move DisplaySurface functions to\n display-surface.c","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260410-qemu-vnc-v2-35-231416f76dc3@redhat.com>","References":"<20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com>","In-Reply-To":"<20260410-qemu-vnc-v2-0-231416f76dc3@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=8074;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=ip6J6xhBFa1TM9CJ2RiUKz+3a5NwlbQbCiticjMAo+4=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp2U0VulXShd3rujT5uudBvVvm2e0/8h788nd6D\n iZ/oBTI4xuJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCadlNFQAKCRDa6OEJdZac\n 5bgNEAC0C0YF6YMTJvLQqXbIEdYKE0ucWlk76Z1TualYN+GLQ+aHEOBeyWiwdDlRqCM+bYQQB0m\n 47c1EdaZnTFzekLdYp7NHyG2gxDb+wQtsycZht+4DtNISwYzcp/hA09bz9o4vwOm7qxAoq1wLdS\n a1RuJ1Rgi25i67t3ld/Cnwuc+BWmcF/xwRrTr3YvccQyrfgu4kYvO2V589biTFVrYdt1zFQEnlo\n 3w4vDeLeUi7bpqwhHpYKd8CGryMzEPBBmSO9lrHsRepgL5xHg33xW+QVShSrWR4hNvh+lyUqt9G\n iAqfc8DNU1EB0kWUYjV6n6W+NUM6IAPGTkny6ANCCFFEYgnZ9xdM+MrMncx2FJRZ0AC45isaRpR\n G/ttn+liX6JTyqNkiGIyyX8jPeDxUBU8uG042w3C1mGbmCAJEXPNYK2iJldxTi0KHkHqkSutXVB\n nup+ySJ4+c2XxzlfIkYpFOedjtXgz3b2IGJfBbuGiNzfkqebH+uZ/bX4hLEFSXjWN4ANmyKcuVH\n mcKUjCsKRReOmX8REM48RyekGnjXc1xdvC6UWvZ1U0QK3jOJ+9MgOQLZQQA7HugPepU6N8PGJ7C\n ABaxoCUZleW9jAB3kwRzdz7fmZEy1r4ZSZfIGmwHaf7ijOwz4It/ORbHEKe94e7XI4Ei07m6uvl\n x7BhcudVKurSxwA==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.4","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"7","X-Spam_score":"0.7","X-Spam_bar":"/","X-Spam_report":"(0.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\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_H2=0.001, RCVD_IN_SBL_CSS=3.335,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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":"Extract 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(-)","diff":"diff --git a/ui/console.c b/ui/console.c\nindex 7ffea2776ef..24794e5a9dc 100644\n--- a/ui/console.c\n+++ b/ui/console.c\n@@ -507,102 +507,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 9ece6f262b6..bae6ea0d2dc 100644\n--- a/ui/meson.build\n+++ b/ui/meson.build\n@@ -5,6 +5,7 @@ system_ss.add(files(\n 'console.c',\n 'cp437.c',\n 'cursor.c',\n+ 'display-surface.c',\n 'dmabuf.c',\n 'input-keymap.c',\n 'input-legacy.c',\n","prefixes":["v2","35/67"]}