From nobody Sun Apr 12 06:03:58 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=1770813069; cv=none; d=zohomail.com; s=zohoarc; b=c7JyZG5RYjxp1kWJWhzqy5PkbjcBsvfFdiozkp9y8FTNBK7yArKuQ5Y7HtsicmhZOneWxG31Ow+f/RCVeqG2TyAni9piefOEk/DfAdwPzFdwWyb516WqO9z49y9vnPxIT/6GUHTT/MdibxAEmZ1E04XITOeSx92lq3fVIHIHZ1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770813069; 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=6UIUvqKAVHmKYMD5HBaon7fRgToMxwvi5ehZIc//TG8=; b=ZlKPOqshkAqGDNoHd8dPUzAG5FlrwDlTVimbB5DzJDZlrqTtH6tIyDEWnbAD9vkS/AmnnV2BtLt8s/aFgoyVhRE3rqYK48aRr5R5oEsIczg62L1tv8B9cjdlMeNcaiht+EdsZ2sU7hlQdj87n2L/gSWbRLIGtyWVaw3ABie4u+g= 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 177081306958412.136919257651925; Wed, 11 Feb 2026 04:31:09 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1227468.1533882 (Exim 4.92) (envelope-from ) id 1vq9Mp-0003cE-30; Wed, 11 Feb 2026 12:30:51 +0000 Received: by outflank-mailman (output) from mailman id 1227468.1533882; Wed, 11 Feb 2026 12:30:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vq9Mo-0003bz-VV; Wed, 11 Feb 2026 12:30:50 +0000 Received: by outflank-mailman (input) for mailman id 1227468; Wed, 11 Feb 2026 12:30:49 +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 1vq9Mn-0001nh-Gb for xen-devel@lists.xenproject.org; Wed, 11 Feb 2026 12:30:49 +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 7e056fb0-0745-11f1-b162-2bf370ae4941; Wed, 11 Feb 2026 13:30:48 +0100 (CET) Received: from mx-prod-mc-08.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-696-zHKrClWFPBOizOCdyanCjA-1; Wed, 11 Feb 2026 07:30:45 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 97CA3180034A; Wed, 11 Feb 2026 12:30:43 +0000 (UTC) Received: from localhost (unknown [10.45.242.6]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0AAFE1800671; Wed, 11 Feb 2026 12:30:41 +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: 7e056fb0-0745-11f1-b162-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770813047; 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=6UIUvqKAVHmKYMD5HBaon7fRgToMxwvi5ehZIc//TG8=; b=FzfoXfEnlO8opgcPShRvpqQ9Q2xMUOGOz8X3Me3sYIU4/128sQyAagN+gxiiYhZjB6ZsPD ALu6lmxxUbjQb5MF/Yuxzd4KnR+Ys87HP66bwcFWvuvFBAkNxgrn6FBv/HOhTL7slhplEH NvLg2T/VOHOj4SrPYG/KQRLckZ8hisg= X-MC-Unique: zHKrClWFPBOizOCdyanCjA-1 X-Mimecast-MFC-AGG-ID: zHKrClWFPBOizOCdyanCjA_1770813044 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Eduardo Habkost , xen-devel@lists.xenproject.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Edgar E. Iglesias" , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Anthony PERARD , Eric Blake , Samuel Thibault , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefano Stabellini , Paul Durrant , Vladimir Sementsov-Ogievskiy Subject: [PULL 05/14] chardev: consistent naming for ChardevClass handlers implementations Date: Wed, 11 Feb 2026 16:29:52 +0400 Message-ID: <20260211123007.3569932-6-marcandre.lureau@redhat.com> In-Reply-To: <20260211123007.3569932-1-marcandre.lureau@redhat.com> References: <20260211123007.3569932-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: 0BcZdT8t_rvHGJUwOwzpeb2gQKhqSJiEo8pQEgtOM00_1770813044 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: 1770813084261158500 From: Vladimir Sementsov-Ogievskiy Most handlers implementations has name like {unit_name}_{handler_name}, which is usual and well-recognized pattern. Convert the rest (especially with useless qemu_ prefixes and misleading qmp_ prefixes) to the common pattern. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260115144606.233252-5-vsementsov@yandex-team.ru> --- chardev/char-console.c | 10 ++--- chardev/char-file.c | 16 ++++---- chardev/char-hub.c | 15 ++++--- chardev/char-mux.c | 15 ++++--- chardev/char-parallel.c | 28 ++++++------- chardev/char-pipe.c | 24 +++++------ chardev/char-pty.c | 19 +++++---- chardev/char-ringbuf.c | 16 ++++---- chardev/char-serial.c | 28 ++++++------- chardev/char-socket.c | 25 ++++++------ chardev/char-stdio.c | 22 +++++----- chardev/char-udp.c | 15 ++++--- chardev/char-win-stdio.c | 20 +++++----- chardev/msmouse.c | 4 +- chardev/spice.c | 40 +++++++++---------- gdbstub/system.c | 8 ++-- ui/gtk.c | 4 +- .../codeconverter/test_regexps.py | 2 +- 18 files changed, 153 insertions(+), 158 deletions(-) diff --git a/chardev/char-console.c b/chardev/char-console.c index 9a2e012d53f..f3ef1a7748c 100644 --- a/chardev/char-console.c +++ b/chardev/char-console.c @@ -26,10 +26,10 @@ #include "chardev/char-win.h" #include "qemu/module.h" =20 -static void qemu_chr_open_win_con(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void console_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { win_chr_set_file(chr, GetStdHandle(STD_OUTPUT_HANDLE), true); } @@ -38,7 +38,7 @@ static void char_console_class_init(ObjectClass *oc, cons= t void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_open =3D qemu_chr_open_win_con; + cc->chr_open =3D console_chr_open; } =20 static const TypeInfo char_console_type_info =3D { diff --git a/chardev/char-file.c b/chardev/char-file.c index 1e293e7054a..568600bb7c4 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -34,10 +34,10 @@ #include "chardev/char-fd.h" #endif =20 -static void qmp_chardev_open_file(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void file_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevFile *file =3D backend->u.file.data; #ifdef _WIN32 @@ -102,8 +102,8 @@ static void qmp_chardev_open_file(Chardev *chr, #endif } =20 -static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backen= d, - Error **errp) +static void file_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *path =3D qemu_opt_get(opts, "path"); const char *inpath =3D qemu_opt_get(opts, "input-path"); @@ -133,8 +133,8 @@ static void char_file_class_init(ObjectClass *oc, const= void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_file_out; - cc->chr_open =3D qmp_chardev_open_file; + cc->chr_parse =3D file_chr_parse; + cc->chr_open =3D file_chr_open; } =20 static const TypeInfo char_file_type_info =3D { diff --git a/chardev/char-hub.c b/chardev/char-hub.c index 082baa84ab8..11556dfa72b 100644 --- a/chardev/char-hub.c +++ b/chardev/char-hub.c @@ -203,10 +203,10 @@ static void hub_chr_update_read_handlers(Chardev *chr) } } =20 -static void qemu_chr_open_hub(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void hub_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHub *hub =3D backend->u.hub.data; HubChardev *d =3D HUB_CHARDEV(chr); @@ -245,8 +245,7 @@ static void qemu_chr_open_hub(Chardev *chr, *be_opened =3D false; } =20 -static void qemu_chr_parse_hub(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void hub_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error *= *errp) { ChardevHub *hub; strList **tail; @@ -276,8 +275,8 @@ static void char_hub_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_hub; - cc->chr_open =3D qemu_chr_open_hub; + cc->chr_parse =3D hub_chr_parse; + cc->chr_open =3D hub_chr_open; 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 c82c2da56dd..f38d66b21f1 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -361,10 +361,10 @@ void mux_set_focus(Chardev *chr, unsigned int focus) mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN); } =20 -static void qemu_chr_open_mux(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void mux_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevMux *mux =3D backend->u.mux.data; Chardev *drv; @@ -384,8 +384,7 @@ static void qemu_chr_open_mux(Chardev *chr, qemu_chr_fe_init(&d->chr, drv, errp); } =20 -static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void mux_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error *= *errp) { const char *chardev =3D qemu_opt_get(opts, "chardev"); ChardevMux *mux; @@ -451,8 +450,8 @@ static void char_mux_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_mux; - cc->chr_open =3D qemu_chr_open_mux; + cc->chr_parse =3D mux_chr_parse; + cc->chr_open =3D mux_chr_open; 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-parallel.c b/chardev/char-parallel.c index a0839b784b8..1be1ef46292 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -70,7 +70,7 @@ static int pp_hw_mode(ParallelChardev *s, uint16_t mode) return 1; } =20 -static int pp_ioctl(Chardev *chr, int cmd, void *arg) +static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg) { ParallelChardev *drv =3D PARALLEL_CHARDEV(chr); int fd =3D drv->fd; @@ -157,7 +157,7 @@ static int pp_ioctl(Chardev *chr, int cmd, void *arg) return 0; } =20 -static void qemu_chr_open_pp_fd(Chardev *chr, +static void parallel_chr_open_fd(Chardev *chr, int fd, bool *be_opened, Error **errp) @@ -185,7 +185,7 @@ typedef struct { #define PARALLEL_CHARDEV(obj) \ OBJECT_CHECK(ParallelChardev, (obj), TYPE_CHARDEV_PARALLEL) =20 -static int pp_ioctl(Chardev *chr, int cmd, void *arg) +static int parallel_chr_ioctl(Chardev *chr, int cmd, void *arg) { ParallelChardev *drv =3D PARALLEL_CHARDEV(chr); uint8_t b; @@ -227,7 +227,7 @@ static int pp_ioctl(Chardev *chr, int cmd, void *arg) return 0; } =20 -static void qemu_chr_open_pp_fd(Chardev *chr, +static void parallel_chr_open_fd(Chardev *chr, int fd, bool *be_opened, Error **errp) @@ -239,10 +239,10 @@ static void qemu_chr_open_pp_fd(Chardev *chr, #endif =20 #ifdef HAVE_CHARDEV_PARALLEL -static void qmp_chardev_open_parallel(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void parallel_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHostdev *parallel =3D backend->u.parallel.data; int fd; @@ -251,11 +251,11 @@ static void qmp_chardev_open_parallel(Chardev *chr, if (fd < 0) { return; } - qemu_chr_open_pp_fd(chr, fd, be_opened, errp); + parallel_chr_open_fd(chr, fd, be_opened, errp); } =20 -static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backen= d, - Error **errp) +static void parallel_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *device =3D qemu_opt_get(opts, "path"); ChardevHostdev *parallel; @@ -274,9 +274,9 @@ static void char_parallel_class_init(ObjectClass *oc, c= onst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_parallel; - cc->chr_open =3D qmp_chardev_open_parallel; - cc->chr_ioctl =3D pp_ioctl; + cc->chr_parse =3D parallel_chr_parse; + cc->chr_open =3D parallel_chr_open; + cc->chr_ioctl =3D parallel_chr_ioctl; } =20 static void char_parallel_finalize(Object *obj) diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index a2cd322efe6..e84492d42b6 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -103,10 +103,10 @@ static int win_chr_pipe_init(Chardev *chr, const char= *filename, return -1; } =20 -static void qemu_chr_open_pipe(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void pipe_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHostdev *opts =3D backend->u.pipe.data; const char *filename =3D opts->device; @@ -118,10 +118,10 @@ static void qemu_chr_open_pipe(Chardev *chr, =20 #else =20 -static void qemu_chr_open_pipe(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void pipe_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHostdev *opts =3D backend->u.pipe.data; int fd_in, fd_out; @@ -162,8 +162,8 @@ static void qemu_chr_open_pipe(Chardev *chr, =20 #endif /* !_WIN32 */ =20 -static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void pipe_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *device =3D qemu_opt_get(opts, "path"); ChardevHostdev *dev; @@ -182,8 +182,8 @@ static void char_pipe_class_init(ObjectClass *oc, const= void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_pipe; - cc->chr_open =3D qemu_chr_open_pipe; + cc->chr_parse =3D pipe_chr_parse; + cc->chr_open =3D pipe_chr_open; } =20 static const TypeInfo char_pipe_type_info =3D { diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 1a15082b025..909ab01f5f2 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -105,7 +105,7 @@ static void pty_chr_update_read_handler(Chardev *chr) } } =20 -static int char_pty_chr_write(Chardev *chr, const uint8_t *buf, int len) +static int pty_chr_write(Chardev *chr, const uint8_t *buf, int len) { PtyChardev *s =3D PTY_CHARDEV(chr); GPollFD pfd; @@ -331,10 +331,10 @@ static int qemu_openpty_raw(int *aslave, char *pty_na= me) return amaster; } =20 -static void char_pty_open(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void pty_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { PtyChardev *s; int master_fd, slave_fd; @@ -378,8 +378,7 @@ static void char_pty_open(Chardev *chr, } } =20 -static void char_pty_parse(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void pty_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error *= *errp) { const char *path =3D qemu_opt_get(opts, "path"); ChardevPty *pty; @@ -394,9 +393,9 @@ static void char_pty_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D char_pty_parse; - cc->chr_open =3D char_pty_open; - cc->chr_write =3D char_pty_chr_write; + cc->chr_parse =3D pty_chr_parse; + cc->chr_open =3D pty_chr_open; + cc->chr_write =3D 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 6d5ba667bb4..19652fe2b3a 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -92,10 +92,10 @@ static void char_ringbuf_finalize(Object *obj) g_free(d->cbuf); } =20 -static void qemu_chr_open_ringbuf(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void ringbuf_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevRingbuf *opts =3D backend->u.ringbuf.data; RingBufChardev *d =3D RINGBUF_CHARDEV(chr); @@ -206,8 +206,8 @@ char *qmp_ringbuf_read(const char *device, int64_t size, return data; } =20 -static void qemu_chr_parse_ringbuf(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void ringbuf_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { int val; ChardevRingbuf *ringbuf; @@ -227,8 +227,8 @@ static void char_ringbuf_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_ringbuf; - cc->chr_open =3D qemu_chr_open_ringbuf; + cc->chr_parse =3D ringbuf_chr_parse; + cc->chr_open =3D ringbuf_chr_open; cc->chr_write =3D ringbuf_chr_write; } =20 diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 97ed7adf736..54c2b3935cf 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -41,10 +41,10 @@ =20 #ifdef _WIN32 =20 -static void qmp_chardev_open_serial(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void serial_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHostdev *serial =3D backend->u.serial.data; =20 @@ -176,7 +176,7 @@ static void tty_serial_init(int fd, int speed, tcsetattr(fd, TCSANOW, &tty); } =20 -static int tty_serial_ioctl(Chardev *chr, int cmd, void *arg) +static int serial_chr_ioctl(Chardev *chr, int cmd, void *arg) { FDChardev *s =3D FD_CHARDEV(chr); QIOChannelFile *fioc =3D QIO_CHANNEL_FILE(s->ioc_in); @@ -258,10 +258,10 @@ static int tty_serial_ioctl(Chardev *chr, int cmd, vo= id *arg) return 0; } =20 -static void qmp_chardev_open_serial(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void serial_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevHostdev *serial =3D backend->u.serial.data; int fd; @@ -285,8 +285,8 @@ static void qmp_chardev_open_serial(Chardev *chr, #endif /* __linux__ || __sun__ */ =20 #ifdef HAVE_CHARDEV_SERIAL -static void qemu_chr_parse_serial(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void serial_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *device =3D qemu_opt_get(opts, "path"); ChardevHostdev *serial; @@ -305,10 +305,10 @@ static void char_serial_class_init(ObjectClass *oc, c= onst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_serial; - cc->chr_open =3D qmp_chardev_open_serial; + cc->chr_parse =3D serial_chr_parse; + cc->chr_open =3D serial_chr_open; #ifndef _WIN32 - cc->chr_ioctl =3D tty_serial_ioctl; + cc->chr_ioctl =3D serial_chr_ioctl; #endif } =20 diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 149a6d8cc15..a3203f2f97b 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -222,7 +222,7 @@ static void tcp_chr_process_IAC_bytes(Chardev *chr, *size =3D j; } =20 -static int tcp_get_msgfds(Chardev *chr, int *fds, int num) +static int tcp_chr_get_msgfds(Chardev *chr, int *fds, int num) { SocketChardev *s =3D SOCKET_CHARDEV(chr); =20 @@ -248,7 +248,7 @@ static int tcp_get_msgfds(Chardev *chr, int *fds, int n= um) return to_copy; } =20 -static int tcp_set_msgfds(Chardev *chr, int *fds, int num) +static int tcp_chr_set_msgfds(Chardev *chr, int *fds, int num) { SocketChardev *s =3D SOCKET_CHARDEV(chr); =20 @@ -367,7 +367,7 @@ static void tcp_chr_free_connection(Chardev *chr) =20 remove_hup_source(s); =20 - tcp_set_msgfds(chr, NULL, 0); + tcp_chr_set_msgfds(chr, NULL, 0); remove_fd_in_watch(chr); if (s->registered_yank && (s->state =3D=3D TCP_CHARDEV_STATE_CONNECTING @@ -1365,10 +1365,10 @@ static bool qmp_chardev_validate_socket(ChardevSock= et *sock, } =20 =20 -static void qmp_chardev_open_socket(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void tcp_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { SocketChardev *s =3D SOCKET_CHARDEV(chr); ChardevSocket *sock =3D backend->u.socket.data; @@ -1456,8 +1456,7 @@ static void qmp_chardev_open_socket(Chardev *chr, } } =20 -static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void tcp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error *= *errp) { const char *path =3D qemu_opt_get(opts, "path"); const char *host =3D qemu_opt_get(opts, "host"); @@ -1585,14 +1584,14 @@ static void char_socket_class_init(ObjectClass *oc,= const void *data) =20 cc->supports_yank =3D true; =20 - cc->chr_parse =3D qemu_chr_parse_socket; - cc->chr_open =3D qmp_chardev_open_socket; + cc->chr_parse =3D tcp_chr_parse; + cc->chr_open =3D tcp_chr_open; 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->chr_get_msgfds =3D tcp_get_msgfds; - cc->chr_set_msgfds =3D tcp_set_msgfds; + cc->chr_get_msgfds =3D tcp_chr_get_msgfds; + cc->chr_set_msgfds =3D tcp_chr_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 b7e9af1388f..f0920a23faa 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -56,7 +56,7 @@ static void term_exit(void) } } =20 -static void qemu_chr_set_echo_stdio(Chardev *chr, bool echo) +static void stdio_chr_set_echo(Chardev *chr, bool echo) { struct termios tty; =20 @@ -82,13 +82,13 @@ static void qemu_chr_set_echo_stdio(Chardev *chr, bool = echo) static void term_stdio_handler(int sig) { /* restore echo after resume from suspend. */ - qemu_chr_set_echo_stdio(NULL, stdio_echo_state); + stdio_chr_set_echo(NULL, stdio_echo_state); } =20 -static void qemu_chr_open_stdio(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void stdio_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevStdio *opts =3D backend->u.stdio.data; struct sigaction act; @@ -122,11 +122,11 @@ static void qemu_chr_open_stdio(Chardev *chr, sigaction(SIGCONT, &act, NULL); =20 stdio_allow_signal =3D !opts->has_signal || opts->signal; - qemu_chr_set_echo_stdio(chr, false); + stdio_chr_set_echo(chr, false); } #endif =20 -static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend, +static void stdio_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error **errp) { ChardevStdio *stdio; @@ -142,10 +142,10 @@ static void char_stdio_class_init(ObjectClass *oc, co= nst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_stdio; + cc->chr_parse =3D stdio_chr_parse; #ifndef _WIN32 - cc->chr_open =3D qemu_chr_open_stdio; - cc->chr_set_echo =3D qemu_chr_set_echo_stdio; + cc->chr_open =3D stdio_chr_open; + cc->chr_set_echo =3D stdio_chr_set_echo; #endif } =20 diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 71b8d8b37df..18f4322408a 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -131,8 +131,7 @@ static void char_udp_finalize(Object *obj) qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } =20 -static void qemu_chr_parse_udp(QemuOpts *opts, ChardevBackend *backend, - Error **errp) +static void udp_chr_parse(QemuOpts *opts, ChardevBackend *backend, Error *= *errp) { const char *host =3D qemu_opt_get(opts, "host"); const char *port =3D qemu_opt_get(opts, "port"); @@ -189,10 +188,10 @@ static void qemu_chr_parse_udp(QemuOpts *opts, Charde= vBackend *backend, } } =20 -static void qmp_chardev_open_udp(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void upd_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevUdp *udp =3D backend->u.udp.data; SocketAddress *local_addr =3D socket_address_flatten(udp->local); @@ -221,8 +220,8 @@ static void char_udp_class_init(ObjectClass *oc, const = void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - cc->chr_parse =3D qemu_chr_parse_udp; - cc->chr_open =3D qmp_chardev_open_udp; + cc->chr_parse =3D udp_chr_parse; + cc->chr_open =3D upd_chr_open; 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 26e67aef1ca..866f3a20398 100644 --- a/chardev/char-win-stdio.c +++ b/chardev/char-win-stdio.c @@ -128,7 +128,7 @@ static void win_stdio_thread_wait_func(void *opaque) SetEvent(stdio->hInputDoneEvent); } =20 -static void qemu_chr_set_echo_win_stdio(Chardev *chr, bool echo) +static void win_stiod_chr_set_echo(Chardev *chr, bool echo) { WinStdioChardev *stdio =3D WIN_STDIO_CHARDEV(chr); DWORD dwMode =3D 0; @@ -142,10 +142,10 @@ static void qemu_chr_set_echo_win_stdio(Chardev *chr,= bool echo) } } =20 -static void qemu_chr_open_stdio(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void win_stdio_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevStdio *opts =3D backend->u.stdio.data; bool stdio_allow_signal =3D !opts->has_signal || opts->signal; @@ -206,7 +206,7 @@ static void qemu_chr_open_stdio(Chardev *chr, =20 SetConsoleMode(stdio->hStdIn, dwMode); =20 - qemu_chr_set_echo_win_stdio(chr, false); + win_stiod_chr_set_echo(chr, false); =20 return; =20 @@ -237,7 +237,7 @@ static void char_win_stdio_finalize(Object *obj) } } =20 -static int win_stdio_write(Chardev *chr, const uint8_t *buf, int len) +static int win_stdio_chr_write(Chardev *chr, const uint8_t *buf, int len) { HANDLE hStdOut =3D GetStdHandle(STD_OUTPUT_HANDLE); DWORD dwSize; @@ -260,9 +260,9 @@ static void char_win_stdio_class_init(ObjectClass *oc, = const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - 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; + cc->chr_open =3D win_stdio_chr_open; + cc->chr_write =3D win_stdio_chr_write; + cc->chr_set_echo =3D win_stiod_chr_set_echo; } =20 static const TypeInfo char_win_stdio_type_info =3D { diff --git a/chardev/msmouse.c b/chardev/msmouse.c index 84050164893..d07cd998cb5 100644 --- a/chardev/msmouse.c +++ b/chardev/msmouse.c @@ -178,7 +178,7 @@ static const QemuInputHandler msmouse_handler =3D { .sync =3D msmouse_input_sync, }; =20 -static int msmouse_ioctl(Chardev *chr, int cmd, void *arg) +static int msmouse_chr_ioctl(Chardev *chr, int cmd, void *arg) { MouseChardev *mouse =3D MOUSE_CHARDEV(chr); int c, i, j; @@ -274,7 +274,7 @@ static void char_msmouse_class_init(ObjectClass *oc, co= nst void *data) 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; + cc->chr_ioctl =3D msmouse_chr_ioctl; } =20 static const TypeInfo char_msmouse_type_info =3D { diff --git a/chardev/spice.c b/chardev/spice.c index 61caa6d0efe..3ea25706653 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -215,7 +215,7 @@ static void char_spice_finalize(Object *obj) g_free((char *)s->sin.portname); } =20 -static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open) +static void spice_vmc_chr_set_fe_open(struct Chardev *chr, int fe_open) { SpiceChardev *s =3D SPICE_CHARDEV(chr); if (fe_open) { @@ -225,7 +225,7 @@ static void spice_vmc_set_fe_open(struct Chardev *chr, = int fe_open) } } =20 -static void spice_port_set_fe_open(struct Chardev *chr, int fe_open) +static void spice_port_chr_set_fe_open(struct Chardev *chr, int fe_open) { SpiceChardev *s =3D SPICE_CHARDEV(chr); =20 @@ -251,10 +251,10 @@ static void chr_open(Chardev *chr, const char *subtyp= e) s->sin.subtype =3D g_strdup(subtype); } =20 -static void qemu_chr_open_spice_vmc(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void spice_vmc_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevSpiceChannel *spicevmc =3D backend->u.spicevmc.data; const char *type =3D spicevmc->type; @@ -281,10 +281,10 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, chr_open(chr, type); } =20 -static void qemu_chr_open_spice_port(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) +static void spice_port_chr_open(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) { ChardevSpicePort *spiceport =3D backend->u.spiceport.data; const char *name =3D spiceport->fqdn; @@ -309,8 +309,8 @@ static void qemu_chr_open_spice_port(Chardev *chr, vmc_register_interface(s); } =20 -static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backe= nd, - Error **errp) +static void spice_vmc_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *name =3D qemu_opt_get(opts, "name"); ChardevSpiceChannel *spicevmc; @@ -325,8 +325,8 @@ static void qemu_chr_parse_spice_vmc(QemuOpts *opts, Ch= ardevBackend *backend, spicevmc->type =3D g_strdup(name); } =20 -static void qemu_chr_parse_spice_port(QemuOpts *opts, ChardevBackend *back= end, - Error **errp) +static void spice_port_chr_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) { const char *name =3D qemu_opt_get(opts, "name"); ChardevSpicePort *spiceport; @@ -364,9 +364,9 @@ static void char_spicevmc_class_init(ObjectClass *oc, c= onst void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - 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; + cc->chr_parse =3D spice_vmc_chr_parse; + cc->chr_open =3D spice_vmc_chr_open; + cc->chr_set_fe_open =3D spice_vmc_chr_set_fe_open; } =20 static const TypeInfo char_spicevmc_type_info =3D { @@ -380,9 +380,9 @@ static void char_spiceport_class_init(ObjectClass *oc, = const void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 - 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; + cc->chr_parse =3D spice_port_chr_parse; + cc->chr_open =3D spice_port_chr_open; + cc->chr_set_fe_open =3D spice_port_chr_set_fe_open; } =20 static const TypeInfo char_spiceport_type_info =3D { diff --git a/gdbstub/system.c b/gdbstub/system.c index 29b9e16a908..e161b14485b 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -225,7 +225,7 @@ static void gdb_sigterm_handler(int signal) } #endif =20 -static int gdb_monitor_write(Chardev *chr, const uint8_t *buf, int len) +static int gdb_chr_write(Chardev *chr, const uint8_t *buf, int len) { g_autoptr(GString) hex_buf =3D g_string_new("O"); gdb_memtohex(hex_buf, buf, len); @@ -233,7 +233,7 @@ static int gdb_monitor_write(Chardev *chr, const uint8_= t *buf, int len) return len; } =20 -static void gdb_monitor_open(Chardev *chr, ChardevBackend *backend, +static void gdb_chr_open(Chardev *chr, ChardevBackend *backend, bool *be_opened, Error **errp) { *be_opened =3D false; @@ -244,8 +244,8 @@ static void char_gdb_class_init(ObjectClass *oc, const = void *data) ChardevClass *cc =3D CHARDEV_CLASS(oc); =20 cc->internal =3D true; - cc->chr_open =3D gdb_monitor_open; - cc->chr_write =3D gdb_monitor_write; + cc->chr_open =3D gdb_chr_open; + cc->chr_write =3D gdb_chr_write; } =20 #define TYPE_CHARDEV_GDB "chardev-gdb" diff --git a/ui/gtk.c b/ui/gtk.c index 6217e9552e3..acf55cdfce2 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1963,7 +1963,7 @@ static void gd_vc_chr_set_echo(Chardev *chr, bool ech= o) =20 static int nb_vcs; static Chardev *vcs[MAX_VCS]; -static void gd_vc_open(Chardev *chr, +static void gd_vc_chr_open(Chardev *chr, ChardevBackend *backend, bool *be_opened, Error **errp) @@ -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->chr_open =3D gd_vc_open; + cc->chr_open =3D gd_vc_chr_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/scripts/codeconverter/codeconverter/test_regexps.py b/scripts/= codeconverter/codeconverter/test_regexps.py index d3a5cc3ad38..2b9f5b80111 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->chr_open =3D qmp_chardev_open_file; + cc->chr_open =3D file_chr_open; } =20 static const TypeInfo char_file_type_info =3D { --=20 2.52.0