From nobody Sun Apr 12 06:05:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770976235; cv=none; d=zohomail.com; s=zohoarc; b=Yb2uIqWIjGF87gDVKF28aPzb925Ui8tnpscKqmV9PGuJ73wgcvp0N6EECoIb9SHUkw7rrBbfuG+z9Xq00q1JYjqVbcKDoG3JcEGDGHclz4Ik7OWC+W8AHHZ6+G/bWVCSwqjXL+4ynJAqUf7aJkgHlXWbO3NyGEFV9KkO166LxxY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770976235; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=K/EYv/wOL3z8Ia2Topl38iZZVA139L2JWNE4O9fOHA4=; b=CMlxC6DedCP2dWjC6EycMgfMid6dEIA3ElY8y+ZUPJQZFjZVEY2u76VEdtrsBbhFd0OaOLVgSsyAXFDvUMOkgq1X4OimYMAKKDVYJdx7Qjv9/vYnQbkIoGvgTO06ypBzamQmmNOnGLHk2hmXdV/01pOiP2sLmW5lqKUYolaEHbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 177097623505495.77617227036785; Fri, 13 Feb 2026 01:50:35 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1230420.1535922 (Exim 4.92) (envelope-from ) id 1vqpoV-0003Mz-29; Fri, 13 Feb 2026 09:50:15 +0000 Received: by outflank-mailman (output) from mailman id 1230420.1535922; Fri, 13 Feb 2026 09:50:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vqpoU-0003Lt-T5; Fri, 13 Feb 2026 09:50:14 +0000 Received: by outflank-mailman (input) for mailman id 1230420; Fri, 13 Feb 2026 09:50:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vqpoT-0001Na-Fw for xen-devel@lists.xenproject.org; Fri, 13 Feb 2026 09:50:13 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 633ae963-08c1-11f1-b163-2bf370ae4941; Fri, 13 Feb 2026 10:50:12 +0100 (CET) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-Bh-00Ep0N_SO-0gTINRxQA-1; Fri, 13 Feb 2026 04:50:06 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 81A0B1884EDC; Fri, 13 Feb 2026 09:49:56 +0000 (UTC) Received: from localhost (unknown [10.44.22.41]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5DA40180066E; Fri, 13 Feb 2026 09:49:54 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 633ae963-08c1-11f1-b163-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770976210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K/EYv/wOL3z8Ia2Topl38iZZVA139L2JWNE4O9fOHA4=; b=bhWACr+pTKP8Xnu904RCUk6br1Nsx5OoZaAwEXSK4jI305fB5ngrIPytXbT0fiX7Yafk6s A7vViJ5NdrK1KqRc7R8JhnRw5M5W13RrbVE0yOPTppC8z5QQ+xdFSaC/1UszXULFFMRnLa GouXu2I2c7IG5c/XvAVLaRtU5laXOhg= X-MC-Unique: Bh-00Ep0N_SO-0gTINRxQA-1 X-Mimecast-MFC-AGG-ID: Bh-00Ep0N_SO-0gTINRxQA_1770976205 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Edgar E. Iglesias" , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eric Blake , Markus Armbruster , Paul Durrant , Anthony PERARD , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefano Stabellini , xen-devel@lists.xenproject.org, Samuel Thibault , Vladimir Sementsov-Ogievskiy Subject: [PULL v2 04/15] chardev: ChardevClass: consistent naming for handlers Date: Fri, 13 Feb 2026 10:49:23 +0100 Message-ID: <20260213094938.4074478-5-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 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-MFC-PROC-ID: P8uDSV4blFUsz4Q9ncgJZnfmgVT5WoPYLXkK8sQW8lI_1770976205 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1770976237015154100 From: Vladimir Sementsov-Ogievskiy Most handlers have name prefixed with "chr_". That's a good practice which helps to grep them. Convert the rest: .parse, .open, get/set_msgfds. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260115144606.233252-4-vsementsov@yandex-team.ru> --- include/chardev/char.h | 8 ++++---- chardev/baum.c | 2 +- chardev/char-console.c | 2 +- chardev/char-fe.c | 8 ++++---- chardev/char-file.c | 4 ++-- chardev/char-hub.c | 4 ++-- chardev/char-mux.c | 4 ++-- chardev/char-null.c | 2 +- chardev/char-parallel.c | 4 ++-- chardev/char-pipe.c | 4 ++-- chardev/char-pty.c | 4 ++-- chardev/char-ringbuf.c | 4 ++-- chardev/char-serial.c | 4 ++-- chardev/char-socket.c | 8 ++++---- chardev/char-stdio.c | 4 ++-- chardev/char-udp.c | 4 ++-- chardev/char-win-stdio.c | 2 +- chardev/char.c | 8 ++++---- chardev/msmouse.c | 2 +- chardev/spice.c | 8 ++++---- chardev/wctablet.c | 2 +- gdbstub/system.c | 2 +- ui/console-vc.c | 4 ++-- ui/dbus-chardev.c | 8 ++++---- ui/dbus.c | 4 ++-- ui/gtk.c | 2 +- ui/spice-app.c | 6 +++--- ui/vdagent.c | 4 ++-- scripts/codeconverter/codeconverter/test_regexps.py | 2 +- 29 files changed, 62 insertions(+), 62 deletions(-) diff --git a/include/chardev/char.h b/include/chardev/char.h index 192cad67d41..d33833b6c02 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -257,10 +257,10 @@ struct ChardevClass { bool supports_yank; =20 /* parse command line options and populate QAPI @backend */ - void (*parse)(QemuOpts *opts, ChardevBackend *backend, Error **errp); + void (*chr_parse)(QemuOpts *opts, ChardevBackend *backend, Error **err= p); =20 /* called after construction, open/starts the backend */ - void (*open)(Chardev *chr, ChardevBackend *backend, + void (*chr_open)(Chardev *chr, ChardevBackend *backend, bool *be_opened, Error **errp); =20 /* write buf to the backend */ @@ -282,10 +282,10 @@ struct ChardevClass { int (*chr_ioctl)(Chardev *s, int cmd, void *arg); =20 /* get ancillary-received fds during last read */ - int (*get_msgfds)(Chardev *s, int* fds, int num); + int (*chr_get_msgfds)(Chardev *s, int* fds, int num); =20 /* set ancillary fds to be sent with next write */ - int (*set_msgfds)(Chardev *s, int *fds, int num); + int (*chr_set_msgfds)(Chardev *s, int *fds, int num); =20 /* accept the given fd */ int (*chr_add_client)(Chardev *chr, int fd); diff --git a/chardev/baum.c b/chardev/baum.c index 157f8b95195..75e41965c11 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -676,7 +676,7 @@ static void char_braille_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D baum_chr_open; + cc->chr_open =3D baum_chr_open; cc->chr_write =3D baum_chr_write; cc->chr_accept_input =3D baum_chr_accept_input; } diff --git a/chardev/char-console.c b/chardev/char-console.c index 7e1bf642ebd..9a2e012d53f 100644 --- a/chardev/char-console.c +++ b/chardev/char-console.c @@ -38,7 +38,7 @@ static void char_console_class_init(ObjectClass *oc, cons= t void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D qemu_chr_open_win_con; + cc->chr_open =3D qemu_chr_open_win_con; } =20 static const TypeInfo char_console_type_info =3D { diff --git a/chardev/char-fe.c b/chardev/char-fe.c index 34b83fc1c4a..a44f2673731 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -130,8 +130,8 @@ int qemu_chr_fe_get_msgfds(CharFrontend *c, int *fds, i= nt len) return -1; } =20 - return CHARDEV_GET_CLASS(s)->get_msgfds ? - CHARDEV_GET_CLASS(s)->get_msgfds(s, fds, len) : -1; + return CHARDEV_GET_CLASS(s)->chr_get_msgfds ? + CHARDEV_GET_CLASS(s)->chr_get_msgfds(s, fds, len) : -1; } =20 int qemu_chr_fe_set_msgfds(CharFrontend *c, int *fds, int num) @@ -142,8 +142,8 @@ int qemu_chr_fe_set_msgfds(CharFrontend *c, int *fds, i= nt num) return -1; } =20 - return CHARDEV_GET_CLASS(s)->set_msgfds ? - CHARDEV_GET_CLASS(s)->set_msgfds(s, fds, num) : -1; + return CHARDEV_GET_CLASS(s)->chr_set_msgfds ? + CHARDEV_GET_CLASS(s)->chr_set_msgfds(s, fds, num) : -1; } =20 void qemu_chr_fe_accept_input(CharFrontend *c) diff --git a/chardev/char-file.c b/chardev/char-file.c index 1f7adf592ff..1e293e7054a 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -133,8 +133,8 @@ static void char_file_class_init(ObjectClass *oc, const= void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_file_out; - cc->open =3D qmp_chardev_open_file; + cc->chr_parse =3D qemu_chr_parse_file_out; + cc->chr_open =3D qmp_chardev_open_file; } =20 static const TypeInfo char_file_type_info =3D { diff --git a/chardev/char-hub.c b/chardev/char-hub.c index d0967c22336..082baa84ab8 100644 --- a/chardev/char-hub.c +++ b/chardev/char-hub.c @@ -276,8 +276,8 @@ static void char_hub_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_hub; - cc->open =3D qemu_chr_open_hub; + cc->chr_parse =3D qemu_chr_parse_hub; + cc->chr_open =3D qemu_chr_open_hub; cc->chr_write =3D hub_chr_write; cc->chr_add_watch =3D hub_chr_add_watch; /* We handle events from backends only */ diff --git a/chardev/char-mux.c b/chardev/char-mux.c index db9e89f441d..c82c2da56dd 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -451,8 +451,8 @@ static void char_mux_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_mux; - cc->open =3D qemu_chr_open_mux; + cc->chr_parse =3D qemu_chr_parse_mux; + cc->chr_open =3D qemu_chr_open_mux; cc->chr_write =3D mux_chr_write; cc->chr_accept_input =3D mux_chr_accept_input; cc->chr_add_watch =3D mux_chr_add_watch; diff --git a/chardev/char-null.c b/chardev/char-null.c index 89cb85da792..674603b3807 100644 --- a/chardev/char-null.c +++ b/chardev/char-null.c @@ -38,7 +38,7 @@ static void char_null_class_init(ObjectClass *oc, const v= oid *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D null_chr_open; + cc->chr_open =3D null_chr_open; } =20 static const TypeInfo char_null_type_info =3D { diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index 62a44b2f969..a0839b784b8 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -274,8 +274,8 @@ static void char_parallel_class_init(ObjectClass *oc, c= onst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_parallel; - cc->open =3D qmp_chardev_open_parallel; + cc->chr_parse =3D qemu_chr_parse_parallel; + cc->chr_open =3D qmp_chardev_open_parallel; cc->chr_ioctl =3D pp_ioctl; } =20 diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index e9f3bb82904..a2cd322efe6 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -182,8 +182,8 @@ static void char_pipe_class_init(ObjectClass *oc, const= void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_pipe; - cc->open =3D qemu_chr_open_pipe; + cc->chr_parse =3D qemu_chr_parse_pipe; + cc->chr_open =3D qemu_chr_open_pipe; } =20 static const TypeInfo char_pipe_type_info =3D { diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 652b0bd9e73..1a15082b025 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -394,8 +394,8 @@ static void char_pty_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D char_pty_parse; - cc->open =3D char_pty_open; + cc->chr_parse =3D char_pty_parse; + cc->chr_open =3D char_pty_open; cc->chr_write =3D char_pty_chr_write; cc->chr_update_read_handler =3D pty_chr_update_read_handler; cc->chr_add_watch =3D pty_chr_add_watch; diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index 98aadb6acfb..6d5ba667bb4 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -227,8 +227,8 @@ static void char_ringbuf_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_ringbuf; - cc->open =3D qemu_chr_open_ringbuf; + cc->chr_parse =3D qemu_chr_parse_ringbuf; + cc->chr_open =3D qemu_chr_open_ringbuf; cc->chr_write =3D ringbuf_chr_write; } =20 diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 4c6ca713eb1..97ed7adf736 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -305,8 +305,8 @@ static void char_serial_class_init(ObjectClass *oc, con= st void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_serial; - cc->open =3D qmp_chardev_open_serial; + cc->chr_parse =3D qemu_chr_parse_serial; + cc->chr_open =3D qmp_chardev_open_serial; #ifndef _WIN32 cc->chr_ioctl =3D tty_serial_ioctl; #endif diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 3f45dd2ecdc..149a6d8cc15 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1585,14 +1585,14 @@ static void char_socket_class_init(ObjectClass *oc,= const void *data) =20 cc->supports_yank =3D true; =20 - cc->parse =3D qemu_chr_parse_socket; - cc->open =3D qmp_chardev_open_socket; + cc->chr_parse =3D qemu_chr_parse_socket; + cc->chr_open =3D qmp_chardev_open_socket; cc->chr_wait_connected =3D tcp_chr_wait_connected; cc->chr_write =3D tcp_chr_write; cc->chr_sync_read =3D tcp_chr_sync_read; cc->chr_disconnect =3D tcp_chr_disconnect; - cc->get_msgfds =3D tcp_get_msgfds; - cc->set_msgfds =3D tcp_set_msgfds; + cc->chr_get_msgfds =3D tcp_get_msgfds; + cc->chr_set_msgfds =3D tcp_set_msgfds; cc->chr_add_client =3D tcp_chr_add_client; cc->chr_add_watch =3D tcp_chr_add_watch; cc->chr_update_read_handler =3D tcp_chr_update_read_handler; diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 2568164a108..b7e9af1388f 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -142,9 +142,9 @@ static void char_stdio_class_init(ObjectClass *oc, cons= t void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_stdio; + cc->chr_parse =3D qemu_chr_parse_stdio; #ifndef _WIN32 - cc->open =3D qemu_chr_open_stdio; + cc->chr_open =3D qemu_chr_open_stdio; cc->chr_set_echo =3D qemu_chr_set_echo_stdio; #endif } diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 1025f577a0d..71b8d8b37df 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -221,8 +221,8 @@ static void char_udp_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_udp; - cc->open =3D qmp_chardev_open_udp; + cc->chr_parse =3D qemu_chr_parse_udp; + cc->chr_open =3D qmp_chardev_open_udp; cc->chr_write =3D udp_chr_write; cc->chr_update_read_handler =3D udp_chr_update_read_handler; } diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c index fb802a00b13..26e67aef1ca 100644 --- a/chardev/char-win-stdio.c +++ b/chardev/char-win-stdio.c @@ -260,7 +260,7 @@ static void char_win_stdio_class_init(ObjectClass *oc, = const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D qemu_chr_open_stdio; + cc->chr_open =3D qemu_chr_open_stdio; cc->chr_write =3D win_stdio_write; cc->chr_set_echo =3D qemu_chr_set_echo_win_stdio; } diff --git a/chardev/char.c b/chardev/char.c index 3e432195a5a..df37d1df161 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -267,8 +267,8 @@ static void qemu_char_open(Chardev *chr, ChardevBackend= *backend, } } =20 - if (cc->open) { - cc->open(chr, backend, be_opened, errp); + if (cc->chr_open) { + cc->chr_open(chr, backend, be_opened, errp); } } =20 @@ -604,8 +604,8 @@ ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Err= or **errp) backend =3D g_new0(ChardevBackend, 1); backend->type =3D CHARDEV_BACKEND_KIND_NULL; =20 - if (cc->parse) { - cc->parse(opts, backend, &local_err); + if (cc->chr_parse) { + cc->chr_parse(opts, backend, &local_err); if (local_err) { error_propagate(errp, local_err); qapi_free_ChardevBackend(backend); diff --git a/chardev/msmouse.c b/chardev/msmouse.c index 1a55755d397..84050164893 100644 --- a/chardev/msmouse.c +++ b/chardev/msmouse.c @@ -271,7 +271,7 @@ static void char_msmouse_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D msmouse_chr_open; + cc->chr_open =3D msmouse_chr_open; cc->chr_write =3D msmouse_chr_write; cc->chr_accept_input =3D msmouse_chr_accept_input; cc->chr_ioctl =3D msmouse_ioctl; diff --git a/chardev/spice.c b/chardev/spice.c index 39b79d60fb4..61caa6d0efe 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -364,8 +364,8 @@ static void char_spicevmc_class_init(ObjectClass *oc, c= onst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_spice_vmc; - cc->open =3D qemu_chr_open_spice_vmc; + cc->chr_parse =3D qemu_chr_parse_spice_vmc; + cc->chr_open =3D qemu_chr_open_spice_vmc; cc->chr_set_fe_open =3D spice_vmc_set_fe_open; } =20 @@ -380,8 +380,8 @@ static void char_spiceport_class_init(ObjectClass *oc, = const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D qemu_chr_parse_spice_port; - cc->open =3D qemu_chr_open_spice_port; + cc->chr_parse =3D qemu_chr_parse_spice_port; + cc->chr_open =3D qemu_chr_open_spice_port; cc->chr_set_fe_open =3D spice_port_set_fe_open; } =20 diff --git a/chardev/wctablet.c b/chardev/wctablet.c index 0dc6ef08f59..8285a56e7bc 100644 --- a/chardev/wctablet.c +++ b/chardev/wctablet.c @@ -346,7 +346,7 @@ static void wctablet_chr_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D wctablet_chr_open; + cc->chr_open =3D wctablet_chr_open; cc->chr_write =3D wctablet_chr_write; cc->chr_ioctl =3D wctablet_chr_ioctl; cc->chr_accept_input =3D wctablet_chr_accept_input; diff --git a/gdbstub/system.c b/gdbstub/system.c index 8ec8b7ea336..29b9e16a908 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -244,7 +244,7 @@ static void char_gdb_class_init(ObjectClass *oc, const = void *data) ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 cc->internal =3D true; - cc->open =3D gdb_monitor_open; + cc->chr_open =3D gdb_monitor_open; cc->chr_write =3D gdb_monitor_write; } =20 diff --git a/ui/console-vc.c b/ui/console-vc.c index 830842064d6..931068d43ab 100644 --- a/ui/console-vc.c +++ b/ui/console-vc.c @@ -1185,8 +1185,8 @@ static void char_vc_class_init(ObjectClass *oc, const= void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D vc_chr_parse; - cc->open =3D vc_chr_open; + cc->chr_parse =3D vc_chr_parse; + cc->chr_open =3D vc_chr_open; cc->chr_write =3D vc_chr_write; cc->chr_accept_input =3D vc_chr_accept_input; cc->chr_set_echo =3D vc_chr_set_echo; diff --git a/ui/dbus-chardev.c b/ui/dbus-chardev.c index d05dddaf81b..f6c426e2209 100644 --- a/ui/dbus-chardev.c +++ b/ui/dbus-chardev.c @@ -205,12 +205,12 @@ dbus_chr_open(Chardev *chr, ChardevBackend *backend, opts =3D qemu_opts_create(qemu_find_opts("chardev"), NULL, 0, &error_a= bort); qemu_opt_set(opts, "server", "on", &error_abort); qemu_opt_set(opts, "wait", "off", &error_abort); - CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->parse( + CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->chr_parse( opts, be, errp); if (*errp) { return; } - CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->open( + CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->chr_open( chr, be, be_opened, errp); } =20 @@ -274,8 +274,8 @@ char_dbus_class_init(ObjectClass *oc, const void *data) DBusChardevClass *klass =3D DBUS_CHARDEV_CLASS(oc); ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D dbus_chr_parse; - cc->open =3D dbus_chr_open; + cc->chr_parse =3D dbus_chr_parse; + cc->chr_open =3D dbus_chr_open; cc->chr_set_fe_open =3D dbus_chr_set_fe_open; cc->chr_set_echo =3D dbus_chr_set_echo; klass->parent_chr_be_event =3D cc->chr_be_event; diff --git a/ui/dbus.c b/ui/dbus.c index d2dff332585..31f6eb1189f 100644 --- a/ui/dbus.c +++ b/ui/dbus.c @@ -451,8 +451,8 @@ dbus_vc_class_init(ObjectClass *oc, const void *data) DBusVCClass *klass =3D DBUS_VC_CLASS(oc); ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - klass->parent_parse =3D cc->parse; - cc->parse =3D dbus_vc_parse; + klass->parent_parse =3D cc->chr_parse; + cc->chr_parse =3D dbus_vc_parse; } =20 static const TypeInfo dbus_vc_type_info =3D { diff --git a/ui/gtk.c b/ui/gtk.c index e83a3666258..6217e9552e3 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1985,7 +1985,7 @@ static void char_gd_vc_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->open =3D gd_vc_open; + cc->chr_open =3D gd_vc_open; cc->chr_write =3D gd_vc_chr_write; cc->chr_accept_input =3D gd_vc_chr_accept_input; cc->chr_set_echo =3D gd_vc_chr_set_echo; diff --git a/ui/spice-app.c b/ui/spice-app.c index 24f78f305c4..ea0b62a22b7 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -106,10 +106,10 @@ static void char_vc_class_init(ObjectClass *oc, const= void *data) VCChardevClass *vc =3D CHARDEV_VC_CLASS(oc); ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - vc->parent_open =3D cc->open; + vc->parent_open =3D cc->chr_open; =20 - cc->parse =3D vc_chr_parse; - cc->open =3D vc_chr_open; + cc->chr_parse =3D vc_chr_parse; + cc->chr_open =3D vc_chr_open; cc->chr_set_echo =3D vc_chr_set_echo; } =20 diff --git a/ui/vdagent.c b/ui/vdagent.c index 142a3691ac9..090771ab171 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -924,8 +924,8 @@ static void vdagent_chr_class_init(ObjectClass *oc, con= st void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->parse =3D vdagent_chr_parse; - cc->open =3D vdagent_chr_open; + cc->chr_parse =3D vdagent_chr_parse; + cc->chr_open =3D vdagent_chr_open; cc->chr_write =3D vdagent_chr_write; cc->chr_set_fe_open =3D vdagent_chr_set_fe_open; cc->chr_accept_input =3D vdagent_chr_accept_input; diff --git a/scripts/codeconverter/codeconverter/test_regexps.py b/scripts/= codeconverter/codeconverter/test_regexps.py index b00e9ef15b2..d3a5cc3ad38 100644 --- a/scripts/codeconverter/codeconverter/test_regexps.py +++ b/scripts/codeconverter/codeconverter/test_regexps.py @@ -57,7 +57,7 @@ def fullmatch(regexp, s): =20 print(RE_TYPEINFO_START) assert re.search(RE_TYPEINFO_START, r''' - cc->open =3D qmp_chardev_open_file; + cc->chr_open =3D qmp_chardev_open_file; } =20 static const TypeInfo char_file_type_info =3D { --=20 2.52.0