{"id":2230543,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230543/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430-qemu-vnc-v3-11-be96757428d0@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":"<20260430-qemu-vnc-v3-11-be96757428d0@redhat.com>","date":"2026-04-29T21:02:44","name":"[v3,11/26] ui/console: remove console_ch_t typedef and console_write_ch()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"dd3947affcfba603641d05a910b07ad24206e430","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/20260430-qemu-vnc-v3-11-be96757428d0@redhat.com/mbox/","series":[{"id":502150,"url":"http://patchwork.ozlabs.org/api/1.1/series/502150/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502150","date":"2026-04-29T21:02:34","name":"ui: add standalone VNC server over D-Bus","version":3,"mbox":"http://patchwork.ozlabs.org/series/502150/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230543/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230543/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=Zge7OOeM;\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 4g5VDQ5JLzz1yJr\n\tfor ; Thu, 30 Apr 2026 07:04:38 +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 1wIC56-0005ZD-2S; Wed, 29 Apr 2026 17:04:28 -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 1wIC54-0005UJ-7U\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 17:04:26 -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 1wIC52-0003N2-Au\n for qemu-devel@nongnu.org; Wed, 29 Apr 2026 17:04:25 -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-313-aOrY4-u6MkuV1uGjYiXf4w-1; Wed,\n 29 Apr 2026 17:04:19 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 1B31119560B7; Wed, 29 Apr 2026 21:04:18 +0000 (UTC)","from localhost (unknown [10.44.22.2])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id AD4F61800348; Wed, 29 Apr 2026 21:04:16 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1777496663;\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=IfE3kM3GXvE+FVkLELiXcNJAoP1JDi8ACboNIJNy4Bc=;\n b=Zge7OOeM+LKtzZLdIl7Gg7P6pbUjFPBc9tHW6+TGdVmE2l3+t5Y3eLGG9SFq1j5dz7BrE+\n SBU9OUciz3sfee6eeNviyyxezyWlZ20BzVTESMaH35M3m/pOxq5H62SHNqcGfG2y9WHn7s\n uvY4wSMVhBpvap4obygE2IiMz+kio/s=","X-MC-Unique":"aOrY4-u6MkuV1uGjYiXf4w-1","X-Mimecast-MFC-AGG-ID":"aOrY4-u6MkuV1uGjYiXf4w_1777496658","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Thu, 30 Apr 2026 01:02:44 +0400","Subject":"[PATCH v3 11/26] ui/console: remove console_ch_t typedef and\n console_write_ch()","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"8bit","Message-Id":"<20260430-qemu-vnc-v3-11-be96757428d0@redhat.com>","References":"<20260430-qemu-vnc-v3-0-be96757428d0@redhat.com>","In-Reply-To":"<20260430-qemu-vnc-v3-0-be96757428d0@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=10560;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=e4ykukOXoAYey5FeMaNxglAMqZqFZfYwcq4HSeTlZKg=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp8nILZRHGHkK4Uk3uUpgz3fdoCRco6QPJSl/9n\n hOE/xivobiJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCafJyCwAKCRDa6OEJdZac\n 5au4D/9ispI+a/VHGpqozmM7YqGJI9I1cC5w5V+ClKF/oSWtN9Io8TWsd+JGH3Yf+tYgbbv/BMQ\n czy06W2XwZAwEp8UZfZodJX1EoNF398sHM2Lxbi9PQ0xBesMijnffBtcFKyMdvF1MHAStfnMzX2\n HIrYlG7zGNNT2Ptjrx63KEeMIBNh+EhBXAHvTmwr7K7yWBux8LWTOURCydJyruNN1cTJxCSMGHk\n T71kkxDhu9vacMowkgr80Nefvmvu/VQPiiTyBmSGQZwrfz7zpR1QUoUuwfpdbGqUthl0QhvoAmA\n YBic2zDY9ytFlZ2UQz89d+T0kHD+5iR9vAZSYmvs6PWI0RiGNysms80xohKdzpKVs6rgL8OGr38\n qHABh7LcWv609XkpG1shdNh7H1xmr0A+9v41Bns/Pt7MQzA7EYT+0uRzBpzEaRSbizOSpp12lzW\n tvrvBEyj45yGGuUG9lWLa35Ij8UIiSZzxImT8JOolYpdhBsG6lxBSXH3iwTc4HIotKTaKJoueOq\n AwBbUBjeO3Pmu2uTrBddNV2i2HvH9MXVKJ9MJQdf9HWxwMBieR+Y77AGjFSVBp0XCliCfWsvraz\n 42HuvBJJfrJMB0rP7aV0mVrS+HDQ3k3dXiumwmR5IJ6IBDjHkoyKX2Ev1+msUwwzfHxIFslU4cE\n X1XZp0F/1mQXCyQ==","X-Developer-Key":"i=marcandre.lureau@redhat.com; a=openpgp;\n fpr=87A9BD933F87C606D276F62DDAE8E10975969CE5","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":"12","X-Spam_score":"1.2","X-Spam_bar":"+","X-Spam_report":"(1.2 / 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 RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001,\n 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":"Since commit e2f82e924d05 (\"console: purge curses bits from\nconsole.h\"), console_ch_t is a plain uint32_t typedef and\nconsole_write_ch() is a trivial assignment (*dest = ch). These\nabstractions were originally needed because console_ch_t was the\ncurses chtype when CONFIG_CURSES was enabled, and console_write_ch()\nhandled VGA-to-curses character translation. That commit moved the\ncurses logic into curses_update(), making the typedef and helper\ndead abstractions.\n\nReplace console_ch_t with uint32_t and console_write_ch() calls\nwith direct assignments.\n\nReviewed-by: Philippe Mathieu-Daudé \nSigned-off-by: Marc-André Lureau \n---\n include/ui/console.h | 9 +--------\n hw/display/jazz_led.c | 10 +++++-----\n hw/display/vga.c | 16 ++++++++--------\n hw/display/virtio-gpu-base.c | 2 +-\n hw/display/virtio-vga.c | 2 +-\n hw/display/vmware_vga.c | 2 +-\n ui/console-vc.c | 11 +++++------\n ui/console.c | 2 +-\n ui/curses.c | 6 +++---\n 9 files changed, 26 insertions(+), 34 deletions(-)","diff":"diff --git a/include/ui/console.h b/include/ui/console.h\nindex 27eacc39cc0..2bf768ed482 100644\n--- a/include/ui/console.h\n+++ b/include/ui/console.h\n@@ -336,13 +336,6 @@ int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx);\n \n bool console_has_gl(QemuConsole *con);\n \n-typedef uint32_t console_ch_t;\n-\n-static inline void console_write_ch(console_ch_t *dest, uint32_t ch)\n-{\n- *dest = ch;\n-}\n-\n enum {\n GRAPHIC_FLAGS_NONE = 0,\n /* require a console/display with GL callbacks */\n@@ -377,7 +370,7 @@ void graphic_console_close(QemuConsole *con);\n void graphic_hw_update(QemuConsole *con);\n void graphic_hw_update_done(QemuConsole *con);\n void graphic_hw_invalidate(QemuConsole *con);\n-void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata);\n+void graphic_hw_text_update(QemuConsole *con, uint32_t *chardata);\n void graphic_hw_gl_block(QemuConsole *con, bool block);\n \n void qemu_console_early_init(void);\ndiff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c\nindex 7d1a020d4d9..ee9758a94b5 100644\n--- a/hw/display/jazz_led.c\n+++ b/hw/display/jazz_led.c\n@@ -228,7 +228,7 @@ static void jazz_led_invalidate_display(void *opaque)\n s->state |= REDRAW_SEGMENTS | REDRAW_BACKGROUND;\n }\n \n-static void jazz_led_text_update(void *opaque, console_ch_t *chardata)\n+static void jazz_led_text_update(void *opaque, uint32_t *chardata)\n {\n LedState *s = opaque;\n char buf[3];\n@@ -238,10 +238,10 @@ static void jazz_led_text_update(void *opaque, console_ch_t *chardata)\n \n /* TODO: draw the segments */\n snprintf(buf, 3, \"%02hhx\", s->segments);\n- console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE,\n- QEMU_COLOR_BLACK, 1));\n- console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE,\n- QEMU_COLOR_BLACK, 1));\n+ *chardata++ = ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE,\n+ QEMU_COLOR_BLACK, 1);\n+ *chardata++ = ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE,\n+ QEMU_COLOR_BLACK, 1);\n \n dpy_text_update(s->con, 0, 0, 2, 1);\n }\ndiff --git a/hw/display/vga.c b/hw/display/vga.c\nindex 776aa443246..2f266f47a39 100644\n--- a/hw/display/vga.c\n+++ b/hw/display/vga.c\n@@ -1901,13 +1901,13 @@ static void vga_reset(void *opaque)\n ((v & 0x00000800) << 10) | ((v & 0x00007000) >> 1))\n /* relay text rendering to the display driver\n * instead of doing a full vga_update_display() */\n-static void vga_update_text(void *opaque, console_ch_t *chardata)\n+static void vga_update_text(void *opaque, uint32_t *chardata)\n {\n VGACommonState *s = opaque;\n int graphic_mode, i, cursor_offset, cursor_visible;\n int cw, cheight, width, height, size, c_min, c_max;\n uint32_t *src;\n- console_ch_t *dst, val;\n+ uint32_t *dst, val;\n char msg_buffer[80];\n int full_update = 0;\n \n@@ -2007,14 +2007,14 @@ static void vga_update_text(void *opaque, console_ch_t *chardata)\n \n if (full_update) {\n for (i = 0; i < size; src ++, dst ++, i ++)\n- console_write_ch(dst, VMEM2CHTYPE(le32_to_cpu(*src)));\n+ *dst = VMEM2CHTYPE(le32_to_cpu(*src));\n \n dpy_text_update(s->con, 0, 0, width, height);\n } else {\n c_max = 0;\n \n for (i = 0; i < size; src ++, dst ++, i ++) {\n- console_write_ch(&val, VMEM2CHTYPE(le32_to_cpu(*src)));\n+ val = VMEM2CHTYPE(le32_to_cpu(*src));\n if (*dst != val) {\n *dst = val;\n c_max = i;\n@@ -2023,7 +2023,7 @@ static void vga_update_text(void *opaque, console_ch_t *chardata)\n }\n c_min = i;\n for (; i < size; src ++, dst ++, i ++) {\n- console_write_ch(&val, VMEM2CHTYPE(le32_to_cpu(*src)));\n+ val = VMEM2CHTYPE(le32_to_cpu(*src));\n if (*dst != val) {\n *dst = val;\n c_max = i;\n@@ -2061,14 +2061,14 @@ static void vga_update_text(void *opaque, console_ch_t *chardata)\n dpy_text_resize(s->con, s->last_width, height);\n \n for (dst = chardata, i = 0; i < s->last_width * height; i ++)\n- console_write_ch(dst ++, ' ');\n+ *dst++ = ' ';\n \n size = strlen(msg_buffer);\n width = (s->last_width - size) / 2;\n dst = chardata + s->last_width + width;\n for (i = 0; i < size; i ++)\n- console_write_ch(dst ++, ATTR2CHTYPE(msg_buffer[i], QEMU_COLOR_BLUE,\n- QEMU_COLOR_BLACK, 1));\n+ *dst++ = ATTR2CHTYPE(msg_buffer[i], QEMU_COLOR_BLUE,\n+ QEMU_COLOR_BLACK, 1);\n \n dpy_text_update(s->con, 0, 0, s->last_width, height);\n }\ndiff --git a/hw/display/virtio-gpu-base.c b/hw/display/virtio-gpu-base.c\nindex 94cf362d152..bdc24492850 100644\n--- a/hw/display/virtio-gpu-base.c\n+++ b/hw/display/virtio-gpu-base.c\n@@ -88,7 +88,7 @@ static bool virtio_gpu_update_display(void *opaque)\n return true;\n }\n \n-static void virtio_gpu_text_update(void *opaque, console_ch_t *chardata)\n+static void virtio_gpu_text_update(void *opaque, uint32_t *chardata)\n {\n }\n \ndiff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c\nindex f4713b91a66..efd4858f3d0 100644\n--- a/hw/display/virtio-vga.c\n+++ b/hw/display/virtio-vga.c\n@@ -31,7 +31,7 @@ static bool virtio_vga_base_update_display(void *opaque)\n }\n }\n \n-static void virtio_vga_base_text_update(void *opaque, console_ch_t *chardata)\n+static void virtio_vga_base_text_update(void *opaque, uint32_t *chardata)\n {\n VirtIOVGABase *vvga = opaque;\n VirtIOGPUBase *g = vvga->vgpu;\ndiff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c\nindex c84c84a445e..11f13c98d7a 100644\n--- a/hw/display/vmware_vga.c\n+++ b/hw/display/vmware_vga.c\n@@ -1184,7 +1184,7 @@ static void vmsvga_invalidate_display(void *opaque)\n s->invalidated = 1;\n }\n \n-static void vmsvga_text_update(void *opaque, console_ch_t *chardata)\n+static void vmsvga_text_update(void *opaque, uint32_t *chardata)\n {\n struct vmsvga_state_s *s = opaque;\n \ndiff --git a/ui/console-vc.c b/ui/console-vc.c\nindex b58fe5de827..b9da9ddf30d 100644\n--- a/ui/console-vc.c\n+++ b/ui/console-vc.c\n@@ -386,7 +386,7 @@ void qemu_text_console_handle_keysym(QemuTextConsole *s, int keysym)\n vt100_keysym(&s->vt, keysym);\n }\n \n-static void text_console_update(void *opaque, console_ch_t *chardata)\n+static void text_console_update(void *opaque, uint32_t *chardata)\n {\n QemuTextConsole *s = QEMU_TEXT_CONSOLE(opaque);\n int i, j, src;\n@@ -396,11 +396,10 @@ static void text_console_update(void *opaque, console_ch_t *chardata)\n chardata += s->vt.text_y[0] * s->vt.width;\n for (i = s->vt.text_y[0]; i <= s->vt.text_y[1]; i ++)\n for (j = 0; j < s->vt.width; j++, src++) {\n- console_write_ch(chardata ++,\n- ATTR2CHTYPE(s->vt.cells[src].ch,\n- s->vt.cells[src].t_attrib.fgcol,\n- s->vt.cells[src].t_attrib.bgcol,\n- s->vt.cells[src].t_attrib.bold));\n+ *chardata++ = ATTR2CHTYPE(s->vt.cells[src].ch,\n+ s->vt.cells[src].t_attrib.fgcol,\n+ s->vt.cells[src].t_attrib.bgcol,\n+ s->vt.cells[src].t_attrib.bold);\n }\n dpy_text_update(QEMU_CONSOLE(s), s->vt.text_x[0], s->vt.text_y[0],\n s->vt.text_x[1] - s->vt.text_x[0], i - s->vt.text_y[0]);\ndiff --git a/ui/console.c b/ui/console.c\nindex 799d61ec1a5..1c75b1a355b 100644\n--- a/ui/console.c\n+++ b/ui/console.c\n@@ -210,7 +210,7 @@ void graphic_hw_invalidate(QemuConsole *con)\n }\n }\n \n-void graphic_hw_text_update(QemuConsole *con, console_ch_t *chardata)\n+void graphic_hw_text_update(QemuConsole *con, uint32_t *chardata)\n {\n if (con && con->hw_ops->text_update) {\n con->hw_ops->text_update(con->hw, chardata);\ndiff --git a/ui/curses.c b/ui/curses.c\nindex af4ccb4227d..96427aa6bb9 100644\n--- a/ui/curses.c\n+++ b/ui/curses.c\n@@ -57,7 +57,7 @@ enum maybe_keycode {\n };\n \n static DisplayChangeListener *dcl;\n-static console_ch_t *screen;\n+static uint32_t *screen;\n static WINDOW *screenpad = NULL;\n static int width, height, gwidth, gheight, invalidate;\n static int px, py, sminx, sminy, smaxx, smaxy;\n@@ -68,7 +68,7 @@ static cchar_t *vga_to_curses;\n static void curses_update(DisplayChangeListener *dcl,\n int x, int y, int w, int h)\n {\n- console_ch_t *line;\n+ uint32_t *line;\n g_autofree cchar_t *curses_line = g_new(cchar_t, width);\n wchar_t wch[CCHARW_MAX];\n attr_t attrs;\n@@ -796,7 +796,7 @@ static void curses_display_init(DisplayState *ds, DisplayOptions *opts)\n if (opts->u.curses.charset) {\n font_charset = opts->u.curses.charset;\n }\n- screen = g_new0(console_ch_t, 160 * 100);\n+ screen = g_new0(uint32_t, 160 * 100);\n vga_to_curses = g_new0(cchar_t, 256);\n curses_setup();\n curses_keyboard_setup();\n","prefixes":["v3","11/26"]}