{"id":2222112,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222112/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260410-qemu-vnc-v2-29-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-29-231416f76dc3@redhat.com>","date":"2026-04-10T19:18:51","name":"[v2,29/67] ui/console: remove console_ch_t typedef and console_write_ch()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"895f374c1ad49a5a5a55c1da52e7f4555c659163","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-29-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/2222112/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222112/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=AH6CX3Qk;\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 4fsmxy24nTz1yGb\n\tfor ; Sat, 11 Apr 2026 05:26:30 +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 1wBHQS-0002NZ-0t; Fri, 10 Apr 2026 15:21:56 -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 1wBHQP-0001x7-Rs\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:21:53 -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 1wBHQN-0001mJ-SX\n for qemu-devel@nongnu.org; Fri, 10 Apr 2026 15:21:53 -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-610-FmmBAiSbMoSOL0urhiJNYw-1; Fri,\n 10 Apr 2026 15:21:48 -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 218051956088\n for ; Fri, 10 Apr 2026 19:21:48 +0000 (UTC)","from localhost (unknown [10.44.22.4])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id D8A17180049F; Fri, 10 Apr 2026 19:21:46 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1775848911;\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=W8WmhM62vcjlMfIWeknYsUyZb9ok8DBEJ8pMwnWqNZk=;\n b=AH6CX3QkvOC3ozdFKMRLVrfv3WRLwm8Lnl6xBv/vjc3fGoQiadjAUf7lz+YdUF26aki9dK\n p7pw2A+UCEJdxqpRoeMzu1qgUJocHztobJ2WHoCaWqqGLSd/jZ9exEZ8RFjtOm1UdA0OOe\n DL3Gn6cmgnq5gNqJ/r3a0nF1ZZa/MGU=","X-MC-Unique":"FmmBAiSbMoSOL0urhiJNYw-1","X-Mimecast-MFC-AGG-ID":"FmmBAiSbMoSOL0urhiJNYw_1775848908","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Date":"Fri, 10 Apr 2026 23:18:51 +0400","Subject":"[PATCH v2 29/67] 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":"<20260410-qemu-vnc-v2-29-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?= ","X-Developer-Signature":"v=1; a=openpgp-sha256; l=10951;\n i=marcandre.lureau@redhat.com; h=from:subject:message-id;\n bh=TFoUqmf0MRQP1GY4HXtM1qmABrYOg9lFPh2W1ZlgYQE=;\n b=owEBbQKS/ZANAwAKAdro4Ql1lpzlAcsmYgBp2U0VuTQ6eLEqSkAwpuBAjf2MRQycpgVk7jnxy\n vCbwxS9ddGJAjMEAAEKAB0WIQSHqb2TP4fGBtJ29i3a6OEJdZac5QUCadlNFQAKCRDa6OEJdZac\n 5aC7EACxDdrbsbhfwiaHpj2NtGrEFgC3pfc34bdKMX+Oivwdv31KTFosV+6rCsUiCVOLRcvJQDn\n +30zmuf9gbkLUi65RRU7U6a2pooCHeM0uDLlqsS1xr4aQo7NE2VQ3mPplC+4iGuhFmg2/v1WPbM\n dPay863O29wkZYb5x3K/mb82d/cAHRB/KRBrFPF4+Z8g/9WGByUvamK/PdPVz9elD11Gj9rVbDF\n RfPu4iCp64AzEh0nkRc8nDLfD3Jg0oWPFpAJLCNn/mRfG476h5h7Ure/742AOi2L2u1eAI4PboR\n 2F422hGN2nSUw3lmfqI4eZ75PBkS6dfL3zPVvzh8JYthcHWVmR///4iW9SZd165JTNx8ObBukQv\n nnBIeQYqoffPJYo9a++EmWtzkp3TpFZjlK9KS/mF31P5CBJLEkeapFiAKVTDZ3ewXcnVUN6Y8AG\n rqd7u5qp82DWl4WkPpY4WMuUQPE00y0A2F/+Z3mMGkCN0dgKRwQd4Y2gsPWAZCo8sLWSh16SG1l\n o/ngf6mxHzo+9VD9g6408iLj5xfa6oL0Pjv531GciB5+BvhCKXvEdM9MM+pqfKKjT30m+XSKPbL\n x2NgQOQ0ORrP3XMeMfIfWCe3ovDg7GYCNfTLX2Aw6WXVfv7qJGpkBCJlfzq8CoTkW59Uw5eGxAo\n TZosQnysXe0pPIA==","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.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":"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\nSigned-off-by: Marc-André Lureau \n---\n include/ui/console.h | 11 ++---------\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, 27 insertions(+), 35 deletions(-)","diff":"diff --git a/include/ui/console.h b/include/ui/console.h\nindex 5b5bba46ec2..75cd48ed7ad 100644\n--- a/include/ui/console.h\n+++ b/include/ui/console.h\n@@ -350,13 +350,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@@ -370,7 +363,7 @@ typedef struct GraphicHwOps {\n void (*invalidate)(void *opaque);\n void (*gfx_update)(void *opaque);\n bool gfx_update_async; /* if true, calls graphic_hw_update_done() */\n- void (*text_update)(void *opaque, console_ch_t *text);\n+ void (*text_update)(void *opaque, uint32_t *text);\n void (*ui_info)(void *opaque, uint32_t head, QemuUIInfo *info);\n void (*gl_block)(void *opaque, bool block);\n } GraphicHwOps;\n@@ -386,7 +379,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 9d62e51bed9..d5783982950 100644\n--- a/hw/display/jazz_led.c\n+++ b/hw/display/jazz_led.c\n@@ -226,7 +226,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@@ -236,10 +236,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 ee7d97b5c21..36cfc59a74e 100644\n--- a/hw/display/vga.c\n+++ b/hw/display/vga.c\n@@ -1899,13 +1899,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@@ -2005,14 +2005,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@@ -2021,7 +2021,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@@ -2059,14 +2059,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 cb76302e2d8..7b107509510 100644\n--- a/hw/display/virtio-gpu-base.c\n+++ b/hw/display/virtio-gpu-base.c\n@@ -87,7 +87,7 @@ static void virtio_gpu_update_display(void *opaque)\n {\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 5e087169f2f..02fb36b31fc 100644\n--- a/hw/display/virtio-vga.c\n+++ b/hw/display/virtio-vga.c\n@@ -31,7 +31,7 @@ static void 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 c2c6bc76e90..1e154e7f99e 100644\n--- a/hw/display/vmware_vga.c\n+++ b/hw/display/vmware_vga.c\n@@ -1183,7 +1183,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 84944f845e1..d58917c1850 100644\n--- a/ui/console-vc.c\n+++ b/ui/console-vc.c\n@@ -381,7 +381,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@@ -391,11 +391,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 8af1dee0e22..b2b879e8533 100644\n--- a/ui/console.c\n+++ b/ui/console.c\n@@ -214,7 +214,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 161f78c35c3..78f21d940e3 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":["v2","29/67"]}