Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2196266/?format=api
{ "id": 2196266, "url": "http://patchwork.ozlabs.org/api/patches/2196266/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260213094938.4074478-6-marcandre.lureau@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260213094938.4074478-6-marcandre.lureau@redhat.com>", "list_archive_url": null, "date": "2026-02-13T09:49:24", "name": "[PULL,v2,05/15] chardev: consistent naming for ChardevClass handlers implementations", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "2b0ab3fa6fc05e05843c61694bb15cad5a26cf0a", "submitter": { "id": 66774, "url": "http://patchwork.ozlabs.org/api/people/66774/?format=api", "name": "Marc-André Lureau", "email": "marcandre.lureau@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260213094938.4074478-6-marcandre.lureau@redhat.com/mbox/", "series": [ { "id": 492070, "url": "http://patchwork.ozlabs.org/api/series/492070/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=492070", "date": "2026-02-13T09:49:19", "name": "[PULL,v2,01/15] char-udp: Fix initial backend open status", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/492070/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2196266/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2196266/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=Diru8wy8;\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 (lists.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 4fC6qw4XqZz1xpl\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 13 Feb 2026 20:51:08 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vqpom-0007CK-FZ; Fri, 13 Feb 2026 04:50:32 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <marcandre.lureau@redhat.com>)\n id 1vqpob-00072C-Q0\n for qemu-devel@nongnu.org; Fri, 13 Feb 2026 04:50:23 -0500", "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 <marcandre.lureau@redhat.com>)\n id 1vqpoX-0007Ha-1O\n for qemu-devel@nongnu.org; Fri, 13 Feb 2026 04:50:21 -0500", "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-440-D7FCKESLPA-4l4K5JjB0Zw-1; Fri,\n 13 Feb 2026 04:50:10 -0500", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])\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 C80991905627; Fri, 13 Feb 2026 09:49:59 +0000 (UTC)", "from localhost (unknown [10.44.22.41])\n by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id B7D9119560BE; Fri, 13 Feb 2026 09:49:58 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1770976215;\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=6UIUvqKAVHmKYMD5HBaon7fRgToMxwvi5ehZIc//TG8=;\n b=Diru8wy8UmGdGHkmzA3sKSWRbKcOUfcFN75EFdvR5+YthNY0LEJAjTzmgqYS56XAZouRtc\n eKMUo1YJ7b/psfkb+jCBkMaEjYVW/uTZUA2FyrHH8zy6D1MxjWbPy6mAKdWOSSsYfTwZ00\n OnUEOztVoq6D3xv7c61+gZFmippkY2Q=", "X-MC-Unique": "D7FCKESLPA-4l4K5JjB0Zw-1", "X-Mimecast-MFC-AGG-ID": "D7FCKESLPA-4l4K5JjB0Zw_1770976208", "From": "marcandre.lureau@redhat.com", "To": "qemu-devel@nongnu.org", "Cc": "=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,\n \"Edgar E. Iglesias\" <edgar.iglesias@gmail.com>, =?utf-8?q?Daniel_P=2E_Berra?=\n\t=?utf-8?q?ng=C3=A9?= <berrange@redhat.com>, Eric Blake <eblake@redhat.com>,\n Markus Armbruster <armbru@redhat.com>, Paul Durrant <paul@xen.org>,\n Anthony PERARD <anthony@xenproject.org>, =?utf-8?q?Philippe_Mathieu-Daud?=\n\t=?utf-8?q?=C3=A9?= <philmd@linaro.org>,\n Eduardo Habkost <eduardo@habkost.net>, Paolo Bonzini <pbonzini@redhat.com>,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Stefano Stabellini <sstabellini@kernel.org>, xen-devel@lists.xenproject.org,\n Samuel Thibault <samuel.thibault@ens-lyon.org>,\n Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>", "Subject": "[PULL v2 05/15] chardev: consistent naming for ChardevClass handlers\n implementations", "Date": "Fri, 13 Feb 2026 10:49:24 +0100", "Message-ID": "<20260213094938.4074478-6-marcandre.lureau@redhat.com>", "In-Reply-To": "<20260213094938.4074478-1-marcandre.lureau@redhat.com>", "References": "<20260213094938.4074478-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.0 on 10.30.177.12", "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": "-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_H2=0.001,\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=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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>\n\nMost handlers implementations has name like {unit_name}_{handler_name},\nwhich is usual and well-recognized pattern. Convert the rest (especially\nwith useless qemu_ prefixes and misleading qmp_ prefixes) to the common\npattern.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>\nReviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>\nReviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>\nMessage-Id: <20260115144606.233252-5-vsementsov@yandex-team.ru>\n---\n chardev/char-console.c | 10 ++---\n chardev/char-file.c | 16 ++++----\n chardev/char-hub.c | 15 ++++---\n chardev/char-mux.c | 15 ++++---\n chardev/char-parallel.c | 28 ++++++-------\n chardev/char-pipe.c | 24 +++++------\n chardev/char-pty.c | 19 +++++----\n chardev/char-ringbuf.c | 16 ++++----\n chardev/char-serial.c | 28 ++++++-------\n chardev/char-socket.c | 25 ++++++------\n chardev/char-stdio.c | 22 +++++-----\n chardev/char-udp.c | 15 ++++---\n chardev/char-win-stdio.c | 20 +++++-----\n chardev/msmouse.c | 4 +-\n chardev/spice.c | 40 +++++++++----------\n gdbstub/system.c | 8 ++--\n ui/gtk.c | 4 +-\n .../codeconverter/test_regexps.py | 2 +-\n 18 files changed, 153 insertions(+), 158 deletions(-)", "diff": "diff --git a/chardev/char-console.c b/chardev/char-console.c\nindex 9a2e012d53f..f3ef1a7748c 100644\n--- a/chardev/char-console.c\n+++ b/chardev/char-console.c\n@@ -26,10 +26,10 @@\n #include \"chardev/char-win.h\"\n #include \"qemu/module.h\"\n \n-static void qemu_chr_open_win_con(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void console_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n win_chr_set_file(chr, GetStdHandle(STD_OUTPUT_HANDLE), true);\n }\n@@ -38,7 +38,7 @@ static void char_console_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_open = qemu_chr_open_win_con;\n+ cc->chr_open = console_chr_open;\n }\n \n static const TypeInfo char_console_type_info = {\ndiff --git a/chardev/char-file.c b/chardev/char-file.c\nindex 1e293e7054a..568600bb7c4 100644\n--- a/chardev/char-file.c\n+++ b/chardev/char-file.c\n@@ -34,10 +34,10 @@\n #include \"chardev/char-fd.h\"\n #endif\n \n-static void qmp_chardev_open_file(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void file_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevFile *file = backend->u.file.data;\n #ifdef _WIN32\n@@ -102,8 +102,8 @@ static void qmp_chardev_open_file(Chardev *chr,\n #endif\n }\n \n-static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void file_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *path = qemu_opt_get(opts, \"path\");\n const char *inpath = qemu_opt_get(opts, \"input-path\");\n@@ -133,8 +133,8 @@ static void char_file_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_file_out;\n- cc->chr_open = qmp_chardev_open_file;\n+ cc->chr_parse = file_chr_parse;\n+ cc->chr_open = file_chr_open;\n }\n \n static const TypeInfo char_file_type_info = {\ndiff --git a/chardev/char-hub.c b/chardev/char-hub.c\nindex 082baa84ab8..11556dfa72b 100644\n--- a/chardev/char-hub.c\n+++ b/chardev/char-hub.c\n@@ -203,10 +203,10 @@ static void hub_chr_update_read_handlers(Chardev *chr)\n }\n }\n \n-static void qemu_chr_open_hub(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void hub_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHub *hub = backend->u.hub.data;\n HubChardev *d = HUB_CHARDEV(chr);\n@@ -245,8 +245,7 @@ static void qemu_chr_open_hub(Chardev *chr,\n *be_opened = false;\n }\n \n-static void qemu_chr_parse_hub(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void hub_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)\n {\n ChardevHub *hub;\n strList **tail;\n@@ -276,8 +275,8 @@ static void char_hub_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_hub;\n- cc->chr_open = qemu_chr_open_hub;\n+ cc->chr_parse = hub_chr_parse;\n+ cc->chr_open = hub_chr_open;\n cc->chr_write = hub_chr_write;\n cc->chr_add_watch = hub_chr_add_watch;\n /* We handle events from backends only */\ndiff --git a/chardev/char-mux.c b/chardev/char-mux.c\nindex c82c2da56dd..f38d66b21f1 100644\n--- a/chardev/char-mux.c\n+++ b/chardev/char-mux.c\n@@ -361,10 +361,10 @@ void mux_set_focus(Chardev *chr, unsigned int focus)\n mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN);\n }\n \n-static void qemu_chr_open_mux(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void mux_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevMux *mux = backend->u.mux.data;\n Chardev *drv;\n@@ -384,8 +384,7 @@ static void qemu_chr_open_mux(Chardev *chr,\n qemu_chr_fe_init(&d->chr, drv, errp);\n }\n \n-static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void mux_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)\n {\n const char *chardev = qemu_opt_get(opts, \"chardev\");\n ChardevMux *mux;\n@@ -451,8 +450,8 @@ static void char_mux_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_mux;\n- cc->chr_open = qemu_chr_open_mux;\n+ cc->chr_parse = mux_chr_parse;\n+ cc->chr_open = mux_chr_open;\n cc->chr_write = mux_chr_write;\n cc->chr_accept_input = mux_chr_accept_input;\n cc->chr_add_watch = mux_chr_add_watch;\ndiff --git a/chardev/char-parallel.c b/chardev/char-parallel.c\nindex a0839b784b8..1be1ef46292 100644\n--- a/chardev/char-parallel.c\n+++ b/chardev/char-parallel.c\n@@ -70,7 +70,7 @@ static int pp_hw_mode(ParallelChardev *s, uint16_t mode)\n return 1;\n }\n \n-static int pp_ioctl(Chardev *chr, int cmd, void *arg)\n+static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg)\n {\n ParallelChardev *drv = PARALLEL_CHARDEV(chr);\n int fd = drv->fd;\n@@ -157,7 +157,7 @@ static int pp_ioctl(Chardev *chr, int cmd, void *arg)\n return 0;\n }\n \n-static void qemu_chr_open_pp_fd(Chardev *chr,\n+static void parallel_chr_open_fd(Chardev *chr,\n int fd,\n bool *be_opened,\n Error **errp)\n@@ -185,7 +185,7 @@ typedef struct {\n #define PARALLEL_CHARDEV(obj) \\\n OBJECT_CHECK(ParallelChardev, (obj), TYPE_CHARDEV_PARALLEL)\n \n-static int pp_ioctl(Chardev *chr, int cmd, void *arg)\n+static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg)\n {\n ParallelChardev *drv = PARALLEL_CHARDEV(chr);\n uint8_t b;\n@@ -227,7 +227,7 @@ static int pp_ioctl(Chardev *chr, int cmd, void *arg)\n return 0;\n }\n \n-static void qemu_chr_open_pp_fd(Chardev *chr,\n+static void parallel_chr_open_fd(Chardev *chr,\n int fd,\n bool *be_opened,\n Error **errp)\n@@ -239,10 +239,10 @@ static void qemu_chr_open_pp_fd(Chardev *chr,\n #endif\n \n #ifdef HAVE_CHARDEV_PARALLEL\n-static void qmp_chardev_open_parallel(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void parallel_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHostdev *parallel = backend->u.parallel.data;\n int fd;\n@@ -251,11 +251,11 @@ static void qmp_chardev_open_parallel(Chardev *chr,\n if (fd < 0) {\n return;\n }\n- qemu_chr_open_pp_fd(chr, fd, be_opened, errp);\n+ parallel_chr_open_fd(chr, fd, be_opened, errp);\n }\n \n-static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void parallel_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *device = qemu_opt_get(opts, \"path\");\n ChardevHostdev *parallel;\n@@ -274,9 +274,9 @@ static void char_parallel_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_parallel;\n- cc->chr_open = qmp_chardev_open_parallel;\n- cc->chr_ioctl = pp_ioctl;\n+ cc->chr_parse = parallel_chr_parse;\n+ cc->chr_open = parallel_chr_open;\n+ cc->chr_ioctl = parallel_chr_ioctl;\n }\n \n static void char_parallel_finalize(Object *obj)\ndiff --git a/chardev/char-pipe.c b/chardev/char-pipe.c\nindex a2cd322efe6..e84492d42b6 100644\n--- a/chardev/char-pipe.c\n+++ b/chardev/char-pipe.c\n@@ -103,10 +103,10 @@ static int win_chr_pipe_init(Chardev *chr, const char *filename,\n return -1;\n }\n \n-static void qemu_chr_open_pipe(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void pipe_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHostdev *opts = backend->u.pipe.data;\n const char *filename = opts->device;\n@@ -118,10 +118,10 @@ static void qemu_chr_open_pipe(Chardev *chr,\n \n #else\n \n-static void qemu_chr_open_pipe(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void pipe_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHostdev *opts = backend->u.pipe.data;\n int fd_in, fd_out;\n@@ -162,8 +162,8 @@ static void qemu_chr_open_pipe(Chardev *chr,\n \n #endif /* !_WIN32 */\n \n-static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void pipe_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *device = qemu_opt_get(opts, \"path\");\n ChardevHostdev *dev;\n@@ -182,8 +182,8 @@ static void char_pipe_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_pipe;\n- cc->chr_open = qemu_chr_open_pipe;\n+ cc->chr_parse = pipe_chr_parse;\n+ cc->chr_open = pipe_chr_open;\n }\n \n static const TypeInfo char_pipe_type_info = {\ndiff --git a/chardev/char-pty.c b/chardev/char-pty.c\nindex 1a15082b025..909ab01f5f2 100644\n--- a/chardev/char-pty.c\n+++ b/chardev/char-pty.c\n@@ -105,7 +105,7 @@ static void pty_chr_update_read_handler(Chardev *chr)\n }\n }\n \n-static int char_pty_chr_write(Chardev *chr, const uint8_t *buf, int len)\n+static int pty_chr_write(Chardev *chr, const uint8_t *buf, int len)\n {\n PtyChardev *s = PTY_CHARDEV(chr);\n GPollFD pfd;\n@@ -331,10 +331,10 @@ static int qemu_openpty_raw(int *aslave, char *pty_name)\n return amaster;\n }\n \n-static void char_pty_open(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void pty_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n PtyChardev *s;\n int master_fd, slave_fd;\n@@ -378,8 +378,7 @@ static void char_pty_open(Chardev *chr,\n }\n }\n \n-static void char_pty_parse(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void pty_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)\n {\n const char *path = qemu_opt_get(opts, \"path\");\n ChardevPty *pty;\n@@ -394,9 +393,9 @@ static void char_pty_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = char_pty_parse;\n- cc->chr_open = char_pty_open;\n- cc->chr_write = char_pty_chr_write;\n+ cc->chr_parse = pty_chr_parse;\n+ cc->chr_open = pty_chr_open;\n+ cc->chr_write = pty_chr_write;\n cc->chr_update_read_handler = pty_chr_update_read_handler;\n cc->chr_add_watch = pty_chr_add_watch;\n }\ndiff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c\nindex 6d5ba667bb4..19652fe2b3a 100644\n--- a/chardev/char-ringbuf.c\n+++ b/chardev/char-ringbuf.c\n@@ -92,10 +92,10 @@ static void char_ringbuf_finalize(Object *obj)\n g_free(d->cbuf);\n }\n \n-static void qemu_chr_open_ringbuf(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void ringbuf_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevRingbuf *opts = backend->u.ringbuf.data;\n RingBufChardev *d = RINGBUF_CHARDEV(chr);\n@@ -206,8 +206,8 @@ char *qmp_ringbuf_read(const char *device, int64_t size,\n return data;\n }\n \n-static void qemu_chr_parse_ringbuf(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void ringbuf_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n int val;\n ChardevRingbuf *ringbuf;\n@@ -227,8 +227,8 @@ static void char_ringbuf_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_ringbuf;\n- cc->chr_open = qemu_chr_open_ringbuf;\n+ cc->chr_parse = ringbuf_chr_parse;\n+ cc->chr_open = ringbuf_chr_open;\n cc->chr_write = ringbuf_chr_write;\n }\n \ndiff --git a/chardev/char-serial.c b/chardev/char-serial.c\nindex 97ed7adf736..54c2b3935cf 100644\n--- a/chardev/char-serial.c\n+++ b/chardev/char-serial.c\n@@ -41,10 +41,10 @@\n \n #ifdef _WIN32\n \n-static void qmp_chardev_open_serial(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void serial_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHostdev *serial = backend->u.serial.data;\n \n@@ -176,7 +176,7 @@ static void tty_serial_init(int fd, int speed,\n tcsetattr(fd, TCSANOW, &tty);\n }\n \n-static int tty_serial_ioctl(Chardev *chr, int cmd, void *arg)\n+static int serial_chr_ioctl(Chardev *chr, int cmd, void *arg)\n {\n FDChardev *s = FD_CHARDEV(chr);\n QIOChannelFile *fioc = QIO_CHANNEL_FILE(s->ioc_in);\n@@ -258,10 +258,10 @@ static int tty_serial_ioctl(Chardev *chr, int cmd, void *arg)\n return 0;\n }\n \n-static void qmp_chardev_open_serial(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void serial_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevHostdev *serial = backend->u.serial.data;\n int fd;\n@@ -285,8 +285,8 @@ static void qmp_chardev_open_serial(Chardev *chr,\n #endif /* __linux__ || __sun__ */\n \n #ifdef HAVE_CHARDEV_SERIAL\n-static void qemu_chr_parse_serial(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void serial_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *device = qemu_opt_get(opts, \"path\");\n ChardevHostdev *serial;\n@@ -305,10 +305,10 @@ static void char_serial_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_serial;\n- cc->chr_open = qmp_chardev_open_serial;\n+ cc->chr_parse = serial_chr_parse;\n+ cc->chr_open = serial_chr_open;\n #ifndef _WIN32\n- cc->chr_ioctl = tty_serial_ioctl;\n+ cc->chr_ioctl = serial_chr_ioctl;\n #endif\n }\n \ndiff --git a/chardev/char-socket.c b/chardev/char-socket.c\nindex 149a6d8cc15..a3203f2f97b 100644\n--- a/chardev/char-socket.c\n+++ b/chardev/char-socket.c\n@@ -222,7 +222,7 @@ static void tcp_chr_process_IAC_bytes(Chardev *chr,\n *size = j;\n }\n \n-static int tcp_get_msgfds(Chardev *chr, int *fds, int num)\n+static int tcp_chr_get_msgfds(Chardev *chr, int *fds, int num)\n {\n SocketChardev *s = SOCKET_CHARDEV(chr);\n \n@@ -248,7 +248,7 @@ static int tcp_get_msgfds(Chardev *chr, int *fds, int num)\n return to_copy;\n }\n \n-static int tcp_set_msgfds(Chardev *chr, int *fds, int num)\n+static int tcp_chr_set_msgfds(Chardev *chr, int *fds, int num)\n {\n SocketChardev *s = SOCKET_CHARDEV(chr);\n \n@@ -367,7 +367,7 @@ static void tcp_chr_free_connection(Chardev *chr)\n \n remove_hup_source(s);\n \n- tcp_set_msgfds(chr, NULL, 0);\n+ tcp_chr_set_msgfds(chr, NULL, 0);\n remove_fd_in_watch(chr);\n if (s->registered_yank &&\n (s->state == TCP_CHARDEV_STATE_CONNECTING\n@@ -1365,10 +1365,10 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,\n }\n \n \n-static void qmp_chardev_open_socket(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void tcp_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n SocketChardev *s = SOCKET_CHARDEV(chr);\n ChardevSocket *sock = backend->u.socket.data;\n@@ -1456,8 +1456,7 @@ static void qmp_chardev_open_socket(Chardev *chr,\n }\n }\n \n-static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void tcp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)\n {\n const char *path = qemu_opt_get(opts, \"path\");\n const char *host = qemu_opt_get(opts, \"host\");\n@@ -1585,14 +1584,14 @@ static void char_socket_class_init(ObjectClass *oc, const void *data)\n \n cc->supports_yank = true;\n \n- cc->chr_parse = qemu_chr_parse_socket;\n- cc->chr_open = qmp_chardev_open_socket;\n+ cc->chr_parse = tcp_chr_parse;\n+ cc->chr_open = tcp_chr_open;\n cc->chr_wait_connected = tcp_chr_wait_connected;\n cc->chr_write = tcp_chr_write;\n cc->chr_sync_read = tcp_chr_sync_read;\n cc->chr_disconnect = tcp_chr_disconnect;\n- cc->chr_get_msgfds = tcp_get_msgfds;\n- cc->chr_set_msgfds = tcp_set_msgfds;\n+ cc->chr_get_msgfds = tcp_chr_get_msgfds;\n+ cc->chr_set_msgfds = tcp_chr_set_msgfds;\n cc->chr_add_client = tcp_chr_add_client;\n cc->chr_add_watch = tcp_chr_add_watch;\n cc->chr_update_read_handler = tcp_chr_update_read_handler;\ndiff --git a/chardev/char-stdio.c b/chardev/char-stdio.c\nindex b7e9af1388f..f0920a23faa 100644\n--- a/chardev/char-stdio.c\n+++ b/chardev/char-stdio.c\n@@ -56,7 +56,7 @@ static void term_exit(void)\n }\n }\n \n-static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo)\n+static void stdio_chr_set_echo(Chardev *chr, bool echo)\n {\n struct termios tty;\n \n@@ -82,13 +82,13 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo)\n static void term_stdio_handler(int sig)\n {\n /* restore echo after resume from suspend. */\n- qemu_chr_set_echo_stdio(NULL, stdio_echo_state);\n+ stdio_chr_set_echo(NULL, stdio_echo_state);\n }\n \n-static void qemu_chr_open_stdio(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void stdio_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevStdio *opts = backend->u.stdio.data;\n struct sigaction act;\n@@ -122,11 +122,11 @@ static void qemu_chr_open_stdio(Chardev *chr,\n sigaction(SIGCONT, &act, NULL);\n \n stdio_allow_signal = !opts->has_signal || opts->signal;\n- qemu_chr_set_echo_stdio(chr, false);\n+ stdio_chr_set_echo(chr, false);\n }\n #endif\n \n-static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend,\n+static void stdio_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n Error **errp)\n {\n ChardevStdio *stdio;\n@@ -142,10 +142,10 @@ static void char_stdio_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_stdio;\n+ cc->chr_parse = stdio_chr_parse;\n #ifndef _WIN32\n- cc->chr_open = qemu_chr_open_stdio;\n- cc->chr_set_echo = qemu_chr_set_echo_stdio;\n+ cc->chr_open = stdio_chr_open;\n+ cc->chr_set_echo = stdio_chr_set_echo;\n #endif\n }\n \ndiff --git a/chardev/char-udp.c b/chardev/char-udp.c\nindex 71b8d8b37df..18f4322408a 100644\n--- a/chardev/char-udp.c\n+++ b/chardev/char-udp.c\n@@ -131,8 +131,7 @@ static void char_udp_finalize(Object *obj)\n qemu_chr_be_event(chr, CHR_EVENT_CLOSED);\n }\n \n-static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void udp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp)\n {\n const char *host = qemu_opt_get(opts, \"host\");\n const char *port = qemu_opt_get(opts, \"port\");\n@@ -189,10 +188,10 @@ static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend,\n }\n }\n \n-static void qmp_chardev_open_udp(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void upd_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevUdp *udp = backend->u.udp.data;\n SocketAddress *local_addr = socket_address_flatten(udp->local);\n@@ -221,8 +220,8 @@ static void char_udp_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_udp;\n- cc->chr_open = qmp_chardev_open_udp;\n+ cc->chr_parse = udp_chr_parse;\n+ cc->chr_open = upd_chr_open;\n cc->chr_write = udp_chr_write;\n cc->chr_update_read_handler = udp_chr_update_read_handler;\n }\ndiff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c\nindex 26e67aef1ca..866f3a20398 100644\n--- a/chardev/char-win-stdio.c\n+++ b/chardev/char-win-stdio.c\n@@ -128,7 +128,7 @@ static void win_stdio_thread_wait_func(void *opaque)\n SetEvent(stdio->hInputDoneEvent);\n }\n \n-static void qemu_chr_set_echo_win_stdio(Chardev *chr, bool echo)\n+static void win_stiod_chr_set_echo(Chardev *chr, bool echo)\n {\n WinStdioChardev *stdio = WIN_STDIO_CHARDEV(chr);\n DWORD dwMode = 0;\n@@ -142,10 +142,10 @@ static void qemu_chr_set_echo_win_stdio(Chardev *chr, bool echo)\n }\n }\n \n-static void qemu_chr_open_stdio(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void win_stdio_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevStdio *opts = backend->u.stdio.data;\n bool stdio_allow_signal = !opts->has_signal || opts->signal;\n@@ -206,7 +206,7 @@ static void qemu_chr_open_stdio(Chardev *chr,\n \n SetConsoleMode(stdio->hStdIn, dwMode);\n \n- qemu_chr_set_echo_win_stdio(chr, false);\n+ win_stiod_chr_set_echo(chr, false);\n \n return;\n \n@@ -237,7 +237,7 @@ static void char_win_stdio_finalize(Object *obj)\n }\n }\n \n-static int win_stdio_write(Chardev *chr, const uint8_t *buf, int len)\n+static int win_stdio_chr_write(Chardev *chr, const uint8_t *buf, int len)\n {\n HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);\n DWORD dwSize;\n@@ -260,9 +260,9 @@ static void char_win_stdio_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_open = qemu_chr_open_stdio;\n- cc->chr_write = win_stdio_write;\n- cc->chr_set_echo = qemu_chr_set_echo_win_stdio;\n+ cc->chr_open = win_stdio_chr_open;\n+ cc->chr_write = win_stdio_chr_write;\n+ cc->chr_set_echo = win_stiod_chr_set_echo;\n }\n \n static const TypeInfo char_win_stdio_type_info = {\ndiff --git a/chardev/msmouse.c b/chardev/msmouse.c\nindex 84050164893..d07cd998cb5 100644\n--- a/chardev/msmouse.c\n+++ b/chardev/msmouse.c\n@@ -178,7 +178,7 @@ static const QemuInputHandler msmouse_handler = {\n .sync = msmouse_input_sync,\n };\n \n-static int msmouse_ioctl(Chardev *chr, int cmd, void *arg)\n+static int msmouse_chr_ioctl(Chardev *chr, int cmd, void *arg)\n {\n MouseChardev *mouse = MOUSE_CHARDEV(chr);\n int c, i, j;\n@@ -274,7 +274,7 @@ static void char_msmouse_class_init(ObjectClass *oc, const void *data)\n cc->chr_open = msmouse_chr_open;\n cc->chr_write = msmouse_chr_write;\n cc->chr_accept_input = msmouse_chr_accept_input;\n- cc->chr_ioctl = msmouse_ioctl;\n+ cc->chr_ioctl = msmouse_chr_ioctl;\n }\n \n static const TypeInfo char_msmouse_type_info = {\ndiff --git a/chardev/spice.c b/chardev/spice.c\nindex 61caa6d0efe..3ea25706653 100644\n--- a/chardev/spice.c\n+++ b/chardev/spice.c\n@@ -215,7 +215,7 @@ static void char_spice_finalize(Object *obj)\n g_free((char *)s->sin.portname);\n }\n \n-static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open)\n+static void spice_vmc_chr_set_fe_open(struct Chardev *chr, int fe_open)\n {\n SpiceChardev *s = SPICE_CHARDEV(chr);\n if (fe_open) {\n@@ -225,7 +225,7 @@ static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open)\n }\n }\n \n-static void spice_port_set_fe_open(struct Chardev *chr, int fe_open)\n+static void spice_port_chr_set_fe_open(struct Chardev *chr, int fe_open)\n {\n SpiceChardev *s = SPICE_CHARDEV(chr);\n \n@@ -251,10 +251,10 @@ static void chr_open(Chardev *chr, const char *subtype)\n s->sin.subtype = g_strdup(subtype);\n }\n \n-static void qemu_chr_open_spice_vmc(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void spice_vmc_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevSpiceChannel *spicevmc = backend->u.spicevmc.data;\n const char *type = spicevmc->type;\n@@ -281,10 +281,10 @@ static void qemu_chr_open_spice_vmc(Chardev *chr,\n chr_open(chr, type);\n }\n \n-static void qemu_chr_open_spice_port(Chardev *chr,\n- ChardevBackend *backend,\n- bool *be_opened,\n- Error **errp)\n+static void spice_port_chr_open(Chardev *chr,\n+ ChardevBackend *backend,\n+ bool *be_opened,\n+ Error **errp)\n {\n ChardevSpicePort *spiceport = backend->u.spiceport.data;\n const char *name = spiceport->fqdn;\n@@ -309,8 +309,8 @@ static void qemu_chr_open_spice_port(Chardev *chr,\n vmc_register_interface(s);\n }\n \n-static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void spice_vmc_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *name = qemu_opt_get(opts, \"name\");\n ChardevSpiceChannel *spicevmc;\n@@ -325,8 +325,8 @@ static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,\n spicevmc->type = g_strdup(name);\n }\n \n-static void qemu_chr_parse_spice_port(QemuOpts *opts, ChardevBackend *backend,\n- Error **errp)\n+static void spice_port_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n {\n const char *name = qemu_opt_get(opts, \"name\");\n ChardevSpicePort *spiceport;\n@@ -364,9 +364,9 @@ static void char_spicevmc_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_spice_vmc;\n- cc->chr_open = qemu_chr_open_spice_vmc;\n- cc->chr_set_fe_open = spice_vmc_set_fe_open;\n+ cc->chr_parse = spice_vmc_chr_parse;\n+ cc->chr_open = spice_vmc_chr_open;\n+ cc->chr_set_fe_open = spice_vmc_chr_set_fe_open;\n }\n \n static const TypeInfo char_spicevmc_type_info = {\n@@ -380,9 +380,9 @@ static void char_spiceport_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_parse = qemu_chr_parse_spice_port;\n- cc->chr_open = qemu_chr_open_spice_port;\n- cc->chr_set_fe_open = spice_port_set_fe_open;\n+ cc->chr_parse = spice_port_chr_parse;\n+ cc->chr_open = spice_port_chr_open;\n+ cc->chr_set_fe_open = spice_port_chr_set_fe_open;\n }\n \n static const TypeInfo char_spiceport_type_info = {\ndiff --git a/gdbstub/system.c b/gdbstub/system.c\nindex 29b9e16a908..e161b14485b 100644\n--- a/gdbstub/system.c\n+++ b/gdbstub/system.c\n@@ -225,7 +225,7 @@ static void gdb_sigterm_handler(int signal)\n }\n #endif\n \n-static int gdb_monitor_write(Chardev *chr, const uint8_t *buf, int len)\n+static int gdb_chr_write(Chardev *chr, const uint8_t *buf, int len)\n {\n g_autoptr(GString) hex_buf = g_string_new(\"O\");\n gdb_memtohex(hex_buf, buf, len);\n@@ -233,7 +233,7 @@ static int gdb_monitor_write(Chardev *chr, const uint8_t *buf, int len)\n return len;\n }\n \n-static void gdb_monitor_open(Chardev *chr, ChardevBackend *backend,\n+static void gdb_chr_open(Chardev *chr, ChardevBackend *backend,\n bool *be_opened, Error **errp)\n {\n *be_opened = false;\n@@ -244,8 +244,8 @@ static void char_gdb_class_init(ObjectClass *oc, const void *data)\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n cc->internal = true;\n- cc->chr_open = gdb_monitor_open;\n- cc->chr_write = gdb_monitor_write;\n+ cc->chr_open = gdb_chr_open;\n+ cc->chr_write = gdb_chr_write;\n }\n \n #define TYPE_CHARDEV_GDB \"chardev-gdb\"\ndiff --git a/ui/gtk.c b/ui/gtk.c\nindex 6217e9552e3..acf55cdfce2 100644\n--- a/ui/gtk.c\n+++ b/ui/gtk.c\n@@ -1963,7 +1963,7 @@ static void gd_vc_chr_set_echo(Chardev *chr, bool echo)\n \n static int nb_vcs;\n static Chardev *vcs[MAX_VCS];\n-static void gd_vc_open(Chardev *chr,\n+static void gd_vc_chr_open(Chardev *chr,\n ChardevBackend *backend,\n bool *be_opened,\n Error **errp)\n@@ -1985,7 +1985,7 @@ static void char_gd_vc_class_init(ObjectClass *oc, const void *data)\n {\n ChardevClass *cc = CHARDEV_CLASS(oc);\n \n- cc->chr_open = gd_vc_open;\n+ cc->chr_open = gd_vc_chr_open;\n cc->chr_write = gd_vc_chr_write;\n cc->chr_accept_input = gd_vc_chr_accept_input;\n cc->chr_set_echo = gd_vc_chr_set_echo;\ndiff --git a/scripts/codeconverter/codeconverter/test_regexps.py b/scripts/codeconverter/codeconverter/test_regexps.py\nindex d3a5cc3ad38..2b9f5b80111 100644\n--- a/scripts/codeconverter/codeconverter/test_regexps.py\n+++ b/scripts/codeconverter/codeconverter/test_regexps.py\n@@ -57,7 +57,7 @@ def fullmatch(regexp, s):\n \n print(RE_TYPEINFO_START)\n assert re.search(RE_TYPEINFO_START, r'''\n- cc->chr_open = qmp_chardev_open_file;\n+ cc->chr_open = file_chr_open;\n }\n \n static const TypeInfo char_file_type_info = {\n", "prefixes": [ "PULL", "v2", "05/15" ] }