[PULL,15/34] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV

Message ID	20200908215239.3519638-16-ehabkost@redhat.com
State	Superseded
Headers	show Return-Path: <SRS0=2IDT=CR=nongnu.org=qemu-devel-bounces+qemu-devel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71DAB2087C From: Eduardo Habkost <ehabkost@redhat.com> To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org> Subject: [PULL 15/34] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV Date: Tue, 8 Sep 2020 17:52:20 -0400 Message-Id: <20200908215239.3519638-16-ehabkost@redhat.com> In-Reply-To: <20200908215239.3519638-1-ehabkost@redhat.com> References: <20200908215239.3519638-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com Precedence: list Cc: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= <berrange@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org>
Series	QOM boilerplate cleanup (v3) \| expand [PULL,00/34] QOM boilerplate cleanup (v3) [PULL,01/34] memory: Remove kernel-doc comment marker [PULL,02/34] qom: make object_ref/unref use a void * instead of Object . [PULL,03/34] qom: provide convenient macros for declaring and defining types [PULL,04/34] qom: Allow class type name to be specified in OBJECT_DECLARE [PULL,05/34] qom: DECLARE__CHECKERS macros [PULL,06/34] qom: Make type checker functions accept const pointers [PULL,07/34] codeconverter: script for automating QOM code cleanups [PULL,08/34] Delete duplicate QOM typedefs [PULL,09/34] Move QOM typedefs and add missing includes [PULL,10/34] Use DECLARE_CHECKER* macros [PULL,11/34] Use DECLARE_CHECKER when possible (--force mode) [PULL,12/34] Use OBJECT_DECLARE_TYPE where possible [PULL,13/34] Use OBJECT_DECLARE_SIMPLE_TYPE when possible [PULL,14/34] gpex: Fix type checking function name [PULL,15/34] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV [PULL,16/34] ap-device: Rename AP_DEVICE_TYPE to TYPE_AP_DEVICE [PULL,17/34] dev-smartcard-reader: Rename CCID_DEV_NAME to TYPE_USB_CCID_DEV [PULL,18/34] vfio: Rename VFIO_AP_DEVICE_TYPE to TYPE_VFIO_AP_DEVICE [PULL,19/34] vmgenid: Rename VMGENID_DEVICE to TYPE_VMGENID [PULL,20/34] ahci: Rename ICH_AHCI to ICH9_AHCI [PULL,21/34] esp: Rename ESP_STATE to ESP [PULL,22/34] filter-rewriter: Rename FILTER_COLO_REWRITER to FILTER_REWRITER [PULL,23/34] rs6000_mc: Rename RS6000MC_DEVICE to RS6000MC [PULL,24/34] sabre: Rename SABRE_DEVICE to SABRE [PULL,25/34] usb: Rename USB_SERIAL_DEV to USB_SERIAL [PULL,26/34] vfio: Rename PCI_VFIO to VFIO_PCI [PULL,27/34] pc87312: Rename TYPE_PC87312_SUPERIO to TYPE_PC87312 [PULL,28/34] tusb6010: Rename TUSB to TUSB6010 [PULL,29/34] xilinx_axidma: Use typedef name for instance_size [PULL,30/34] omap_intc: Use typedef name for instance_size [PULL,31/34] lpc_ich9: Use typedef name for instance_size [PULL,32/34] xilinx_axienet: Use typedef name for instance_size [PULL,33/34] vhost-user-vga: Use typedef name for instance_size [PULL,34/34] virtio-vga: Use typedef name for instance_size

diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h index aba0240759..832dc10a95 100644 --- a/chardev/chardev-internal.h +++ b/chardev/chardev-internal.h @@ -55,9 +55,9 @@ struct MuxChardev { typedef struct MuxChardev MuxChardev; DECLARE_INSTANCE_CHECKER(MuxChardev, MUX_CHARDEV, - TYPE_CHARDEV_MUX) + TYPE_MUX_CHARDEV) #define CHARDEV_IS_MUX(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX) + object_dynamic_cast(OBJECT(chr), TYPE_MUX_CHARDEV) void mux_set_focus(Chardev *chr, int focus); void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event); diff --git a/include/chardev/char-fd.h b/include/chardev/char-fd.h index 9de0e440de..14c664fc83 100644 --- a/include/chardev/char-fd.h +++ b/include/chardev/char-fd.h @@ -36,10 +36,10 @@ struct FDChardev { }; typedef struct FDChardev FDChardev; -#define TYPE_CHARDEV_FD "chardev-fd" +#define TYPE_FD_CHARDEV "chardev-fd" DECLARE_INSTANCE_CHECKER(FDChardev, FD_CHARDEV, - TYPE_CHARDEV_FD) + TYPE_FD_CHARDEV) void qemu_chr_open_fd(Chardev *chr, int fd_in, int fd_out); int qmp_chardev_open_file_source(char *src, int flags, Error **errp); diff --git a/include/chardev/char-win-stdio.h b/include/chardev/char-win-stdio.h index d7314f734d..139dfbe92f 100644 --- a/include/chardev/char-win-stdio.h +++ b/include/chardev/char-win-stdio.h @@ -24,6 +24,6 @@ #ifndef CHAR_WIN_STDIO_H #define CHAR_WIN_STDIO_H -#define TYPE_CHARDEV_WIN_STDIO "chardev-win-stdio" +#define TYPE_WIN_STDIO_CHARDEV "chardev-win-stdio" #endif /* CHAR_WIN_STDIO_H */ diff --git a/include/chardev/char-win.h b/include/chardev/char-win.h index 485521469c..a1745ba267 100644 --- a/include/chardev/char-win.h +++ b/include/chardev/char-win.h @@ -43,9 +43,9 @@ typedef struct WinChardev WinChardev; #define NSENDBUF 2048 #define NRECVBUF 2048 -#define TYPE_CHARDEV_WIN "chardev-win" +#define TYPE_WIN_CHARDEV "chardev-win" DECLARE_INSTANCE_CHECKER(WinChardev, WIN_CHARDEV, - TYPE_CHARDEV_WIN) + TYPE_WIN_CHARDEV) void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open); int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp); diff --git a/include/chardev/char.h b/include/chardev/char.h index 5874de57ea..0f358a4eee 100644 --- a/include/chardev/char.h +++ b/include/chardev/char.h @@ -230,24 +230,24 @@ typedef struct ChardevClass ChardevClass; DECLARE_OBJ_CHECKERS(Chardev, ChardevClass, CHARDEV, TYPE_CHARDEV) -#define TYPE_CHARDEV_NULL "chardev-null" -#define TYPE_CHARDEV_MUX "chardev-mux" -#define TYPE_CHARDEV_RINGBUF "chardev-ringbuf" -#define TYPE_CHARDEV_PTY "chardev-pty" -#define TYPE_CHARDEV_CONSOLE "chardev-console" -#define TYPE_CHARDEV_STDIO "chardev-stdio" -#define TYPE_CHARDEV_PIPE "chardev-pipe" -#define TYPE_CHARDEV_MEMORY "chardev-memory" -#define TYPE_CHARDEV_PARALLEL "chardev-parallel" -#define TYPE_CHARDEV_FILE "chardev-file" -#define TYPE_CHARDEV_SERIAL "chardev-serial" -#define TYPE_CHARDEV_SOCKET "chardev-socket" -#define TYPE_CHARDEV_UDP "chardev-udp" +#define TYPE_NULL_CHARDEV "chardev-null" +#define TYPE_MUX_CHARDEV "chardev-mux" +#define TYPE_RINGBUF_CHARDEV "chardev-ringbuf" +#define TYPE_PTY_CHARDEV "chardev-pty" +#define TYPE_CONSOLE_CHARDEV "chardev-console" +#define TYPE_STDIO_CHARDEV "chardev-stdio" +#define TYPE_PIPE_CHARDEV "chardev-pipe" +#define TYPE_MEMORY_CHARDEV "chardev-memory" +#define TYPE_PARALLEL_CHARDEV "chardev-parallel" +#define TYPE_FILE_CHARDEV "chardev-file" +#define TYPE_SERIAL_CHARDEV "chardev-serial" +#define TYPE_SOCKET_CHARDEV "chardev-socket" +#define TYPE_UDP_CHARDEV "chardev-udp" #define CHARDEV_IS_RINGBUF(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_RINGBUF) + object_dynamic_cast(OBJECT(chr), TYPE_RINGBUF_CHARDEV) #define CHARDEV_IS_PTY(chr) \ - object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_PTY) + object_dynamic_cast(OBJECT(chr), TYPE_PTY_CHARDEV) struct ChardevClass { ObjectClass parent_class; diff --git a/include/chardev/spice.h b/include/chardev/spice.h index 99f26aedde..302573b582 100644 --- a/include/chardev/spice.h +++ b/include/chardev/spice.h @@ -17,12 +17,12 @@ struct SpiceChardev { }; typedef struct SpiceChardev SpiceChardev; -#define TYPE_CHARDEV_SPICE "chardev-spice" -#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc" -#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport" +#define TYPE_SPICE_CHARDEV "chardev-spice" +#define TYPE_SPICEVMC_CHARDEV "chardev-spicevmc" +#define TYPE_SPICEPORT_CHARDEV "chardev-spiceport" DECLARE_INSTANCE_CHECKER(SpiceChardev, SPICE_CHARDEV, - TYPE_CHARDEV_SPICE) + TYPE_SPICE_CHARDEV) void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend, bool *be_opened, Error **errp); diff --git a/chardev/baum.c b/chardev/baum.c index 5deca778bc..d6c9f698c1 100644 --- a/chardev/baum.c +++ b/chardev/baum.c @@ -104,9 +104,9 @@ struct BaumChardev { }; typedef struct BaumChardev BaumChardev; -#define TYPE_CHARDEV_BRAILLE "chardev-braille" +#define TYPE_BRAILLE_CHARDEV "chardev-braille" DECLARE_INSTANCE_CHECKER(BaumChardev, BAUM_CHARDEV, - TYPE_CHARDEV_BRAILLE) + TYPE_BRAILLE_CHARDEV) /* Let's assume NABCC by default */ enum way { @@ -674,7 +674,7 @@ static void char_braille_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_braille_type_info = { - .name = TYPE_CHARDEV_BRAILLE, + .name = TYPE_BRAILLE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(BaumChardev), .instance_finalize = char_braille_finalize, diff --git a/chardev/char-console.c b/chardev/char-console.c index 6c4ce5dbce..5d175389fd 100644 --- a/chardev/char-console.c +++ b/chardev/char-console.c @@ -42,8 +42,8 @@ static void char_console_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_console_type_info = { - .name = TYPE_CHARDEV_CONSOLE, - .parent = TYPE_CHARDEV_WIN, + .name = TYPE_CONSOLE_CHARDEV, + .parent = TYPE_WIN_CHARDEV, .class_init = char_console_class_init, }; diff --git a/chardev/char-fd.c b/chardev/char-fd.c index c2d8101106..031fe2a2d6 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -154,7 +154,7 @@ static void char_fd_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_fd_type_info = { - .name = TYPE_CHARDEV_FD, + .name = TYPE_FD_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(FDChardev), .instance_finalize = char_fd_finalize, diff --git a/chardev/char-file.c b/chardev/char-file.c index 2fd80707e5..fc53bdb4aa 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -124,11 +124,11 @@ static void char_file_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_file_type_info = { - .name = TYPE_CHARDEV_FILE, + .name = TYPE_FILE_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_file_class_init, }; diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 6f980bb836..8930b4d5e8 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -388,7 +388,7 @@ static void char_mux_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_mux_type_info = { - .name = TYPE_CHARDEV_MUX, + .name = TYPE_MUX_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_mux_class_init, .instance_size = sizeof(MuxChardev), diff --git a/chardev/char-null.c b/chardev/char-null.c index 1c6a2900f9..fcddd33452 100644 --- a/chardev/char-null.c +++ b/chardev/char-null.c @@ -42,7 +42,7 @@ static void char_null_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_null_type_info = { - .name = TYPE_CHARDEV_NULL, + .name = TYPE_NULL_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(Chardev), .class_init = char_null_class_init, diff --git a/chardev/char-parallel.c b/chardev/char-parallel.c index 66e4589b2b..289c1b002c 100644 --- a/chardev/char-parallel.c +++ b/chardev/char-parallel.c @@ -58,7 +58,7 @@ struct ParallelChardev { typedef struct ParallelChardev ParallelChardev; DECLARE_INSTANCE_CHECKER(ParallelChardev, PARALLEL_CHARDEV, - TYPE_CHARDEV_PARALLEL) + TYPE_PARALLEL_CHARDEV) static int pp_hw_mode(ParallelChardev *s, uint16_t mode) { @@ -303,7 +303,7 @@ static void char_parallel_finalize(Object *obj) } static const TypeInfo char_parallel_type_info = { - .name = TYPE_CHARDEV_PARALLEL, + .name = TYPE_PARALLEL_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(ParallelChardev), .instance_finalize = char_parallel_finalize, diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c index fd12c9e63b..7458433256 100644 --- a/chardev/char-pipe.c +++ b/chardev/char-pipe.c @@ -179,11 +179,11 @@ static void char_pipe_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_pipe_type_info = { - .name = TYPE_CHARDEV_PIPE, + .name = TYPE_PIPE_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_pipe_class_init, }; diff --git a/chardev/char-pty.c b/chardev/char-pty.c index a2d1e7c985..9cf77596d2 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -46,7 +46,7 @@ struct PtyChardev { typedef struct PtyChardev PtyChardev; DECLARE_INSTANCE_CHECKER(PtyChardev, PTY_CHARDEV, - TYPE_CHARDEV_PTY) + TYPE_PTY_CHARDEV) static void pty_chr_state(Chardev *chr, int connected); @@ -240,7 +240,7 @@ static void char_pty_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_pty_type_info = { - .name = TYPE_CHARDEV_PTY, + .name = TYPE_PTY_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(PtyChardev), .instance_finalize = char_pty_finalize, diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c index d40d21d3cf..edeb7daeae 100644 --- a/chardev/char-ringbuf.c +++ b/chardev/char-ringbuf.c @@ -43,7 +43,7 @@ struct RingBufChardev { typedef struct RingBufChardev RingBufChardev; DECLARE_INSTANCE_CHECKER(RingBufChardev, RINGBUF_CHARDEV, - TYPE_CHARDEV_RINGBUF) + TYPE_RINGBUF_CHARDEV) static size_t ringbuf_count(const Chardev *chr) { @@ -233,7 +233,7 @@ static void char_ringbuf_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_ringbuf_type_info = { - .name = TYPE_CHARDEV_RINGBUF, + .name = TYPE_RINGBUF_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_ringbuf_class_init, .instance_size = sizeof(RingBufChardev), @@ -242,8 +242,8 @@ static const TypeInfo char_ringbuf_type_info = { /* Bug-compatibility: */ static const TypeInfo char_memory_type_info = { - .name = TYPE_CHARDEV_MEMORY, - .parent = TYPE_CHARDEV_RINGBUF, + .name = TYPE_MEMORY_CHARDEV, + .parent = TYPE_RINGBUF_CHARDEV, }; static void register_types(void) diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 7c3d84ae24..381107bd89 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -308,11 +308,11 @@ static void char_serial_class_init(ObjectClass *oc, void *data) static const TypeInfo char_serial_type_info = { - .name = TYPE_CHARDEV_SERIAL, + .name = TYPE_SERIAL_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, + .parent = TYPE_WIN_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .class_init = char_serial_class_init, }; diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 95e45812d5..bb5ddc586c 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -89,7 +89,7 @@ struct SocketChardev { typedef struct SocketChardev SocketChardev; DECLARE_INSTANCE_CHECKER(SocketChardev, SOCKET_CHARDEV, - TYPE_CHARDEV_SOCKET) + TYPE_SOCKET_CHARDEV) static gboolean socket_reconnect_timeout(gpointer opaque); static void tcp_chr_telnet_init(Chardev *chr); @@ -1506,7 +1506,7 @@ static void char_socket_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_socket_type_info = { - .name = TYPE_CHARDEV_SOCKET, + .name = TYPE_SOCKET_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(SocketChardev), .instance_finalize = char_socket_finalize, diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 82eaebc1db..fb28eaeb87 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -150,11 +150,11 @@ static void char_stdio_finalize(Object *obj) } static const TypeInfo char_stdio_type_info = { - .name = TYPE_CHARDEV_STDIO, + .name = TYPE_STDIO_CHARDEV, #ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN_STDIO, + .parent = TYPE_WIN_STDIO_CHARDEV, #else - .parent = TYPE_CHARDEV_FD, + .parent = TYPE_FD_CHARDEV, #endif .instance_finalize = char_stdio_finalize, .class_init = char_stdio_class_init, diff --git a/chardev/char-udp.c b/chardev/char-udp.c index 16b5dbce58..6d7b9d2805 100644 --- a/chardev/char-udp.c +++ b/chardev/char-udp.c @@ -46,7 +46,7 @@ struct UdpChardev { typedef struct UdpChardev UdpChardev; DECLARE_INSTANCE_CHECKER(UdpChardev, UDP_CHARDEV, - TYPE_CHARDEV_UDP) + TYPE_UDP_CHARDEV) /* Called with chr_write_lock held. */ static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len) @@ -231,7 +231,7 @@ static void char_udp_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_udp_type_info = { - .name = TYPE_CHARDEV_UDP, + .name = TYPE_UDP_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(UdpChardev), .instance_finalize = char_udp_finalize, diff --git a/chardev/char-win-stdio.c b/chardev/char-win-stdio.c index a4771ab82e..f333b8cedc 100644 --- a/chardev/char-win-stdio.c +++ b/chardev/char-win-stdio.c @@ -41,7 +41,7 @@ struct WinStdioChardev { typedef struct WinStdioChardev WinStdioChardev; DECLARE_INSTANCE_CHECKER(WinStdioChardev, WIN_STDIO_CHARDEV, - TYPE_CHARDEV_WIN_STDIO) + TYPE_WIN_STDIO_CHARDEV) static void win_stdio_wait_func(void *opaque) { @@ -255,7 +255,7 @@ static void char_win_stdio_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_win_stdio_type_info = { - .name = TYPE_CHARDEV_WIN_STDIO, + .name = TYPE_WIN_STDIO_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(WinStdioChardev), .instance_finalize = char_win_stdio_finalize, diff --git a/chardev/char-win.c b/chardev/char-win.c index d4fb44c4dc..69dcf48873 100644 --- a/chardev/char-win.c +++ b/chardev/char-win.c @@ -228,7 +228,7 @@ static void char_win_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_win_type_info = { - .name = TYPE_CHARDEV_WIN, + .name = TYPE_WIN_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(WinChardev), .instance_finalize = char_win_finalize, diff --git a/chardev/char.c b/chardev/char.c index 77e7ec814f..afebdc345e 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -674,7 +674,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, GMainContext *context, backend->type = CHARDEV_BACKEND_KIND_MUX; backend->u.mux.data = g_new0(ChardevMux, 1); backend->u.mux.data->chardev = g_strdup(bid); - mux = qemu_chardev_new(id, TYPE_CHARDEV_MUX, backend, context, errp); + mux = qemu_chardev_new(id, TYPE_MUX_CHARDEV, backend, context, errp); if (mux == NULL) { object_unparent(OBJECT(chr)); chr = NULL; diff --git a/chardev/msmouse.c b/chardev/msmouse.c index eb9231dcdb..4033ca714d 100644 --- a/chardev/msmouse.c +++ b/chardev/msmouse.c @@ -44,9 +44,9 @@ struct MouseChardev { }; typedef struct MouseChardev MouseChardev; -#define TYPE_CHARDEV_MSMOUSE "chardev-msmouse" +#define TYPE_MSMOUSE_CHARDEV "chardev-msmouse" DECLARE_INSTANCE_CHECKER(MouseChardev, MOUSE_CHARDEV, - TYPE_CHARDEV_MSMOUSE) + TYPE_MSMOUSE_CHARDEV) static void msmouse_chr_accept_input(Chardev *chr) { @@ -178,7 +178,7 @@ static void char_msmouse_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_msmouse_type_info = { - .name = TYPE_CHARDEV_MSMOUSE, + .name = TYPE_MSMOUSE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(MouseChardev), .instance_finalize = char_msmouse_finalize, diff --git a/chardev/spice.c b/chardev/spice.c index bf7ea1e294..7423001b71 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -376,7 +376,7 @@ static void char_spice_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spice_type_info = { - .name = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICE_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(SpiceChardev), .instance_finalize = char_spice_finalize, @@ -394,8 +394,8 @@ static void char_spicevmc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spicevmc_type_info = { - .name = TYPE_CHARDEV_SPICEVMC, - .parent = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICEVMC_CHARDEV, + .parent = TYPE_SPICE_CHARDEV, .class_init = char_spicevmc_class_init, }; @@ -409,8 +409,8 @@ static void char_spiceport_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_spiceport_type_info = { - .name = TYPE_CHARDEV_SPICEPORT, - .parent = TYPE_CHARDEV_SPICE, + .name = TYPE_SPICEPORT_CHARDEV, + .parent = TYPE_SPICE_CHARDEV, .class_init = char_spiceport_class_init, }; diff --git a/chardev/testdev.c b/chardev/testdev.c index a92caca3c3..5ef9a59817 100644 --- a/chardev/testdev.c +++ b/chardev/testdev.c @@ -39,9 +39,9 @@ struct TestdevChardev { }; typedef struct TestdevChardev TestdevChardev; -#define TYPE_CHARDEV_TESTDEV "chardev-testdev" +#define TYPE_TESTDEV_CHARDEV "chardev-testdev" DECLARE_INSTANCE_CHECKER(TestdevChardev, TESTDEV_CHARDEV, - TYPE_CHARDEV_TESTDEV) + TYPE_TESTDEV_CHARDEV) /* Try to interpret a whole incoming packet */ static int testdev_eat_packet(TestdevChardev *testdev) @@ -118,7 +118,7 @@ static void char_testdev_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_testdev_type_info = { - .name = TYPE_CHARDEV_TESTDEV, + .name = TYPE_TESTDEV_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(TestdevChardev), .class_init = char_testdev_class_init, diff --git a/chardev/wctablet.c b/chardev/wctablet.c index 95e005f5a5..2cc018efb3 100644 --- a/chardev/wctablet.c +++ b/chardev/wctablet.c @@ -85,9 +85,9 @@ struct TabletChardev { }; typedef struct TabletChardev TabletChardev; -#define TYPE_CHARDEV_WCTABLET "chardev-wctablet" +#define TYPE_WCTABLET_CHARDEV "chardev-wctablet" DECLARE_INSTANCE_CHECKER(TabletChardev, WCTABLET_CHARDEV, - TYPE_CHARDEV_WCTABLET) + TYPE_WCTABLET_CHARDEV) static void wctablet_chr_accept_input(Chardev *chr); @@ -352,7 +352,7 @@ static void wctablet_chr_class_init(ObjectClass *oc, void *data) } static const TypeInfo wctablet_type_info = { - .name = TYPE_CHARDEV_WCTABLET, + .name = TYPE_WCTABLET_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(TabletChardev), .instance_finalize = wctablet_chr_finalize, diff --git a/gdbstub.c b/gdbstub.c index 9dfb6e4142..7afdcf0f37 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -3301,10 +3301,10 @@ static void char_gdb_class_init(ObjectClass *oc, void *data) cc->chr_write = gdb_monitor_write; } -#define TYPE_CHARDEV_GDB "chardev-gdb" +#define TYPE_GDB_CHARDEV "chardev-gdb" static const TypeInfo char_gdb_type_info = { - .name = TYPE_CHARDEV_GDB, + .name = TYPE_GDB_CHARDEV, .parent = TYPE_CHARDEV, .class_init = char_gdb_class_init, }; @@ -3409,7 +3409,7 @@ int gdbserver_start(const char *device) qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL); /* Initialize a monitor terminal for gdb */ - mon_chr = qemu_chardev_new(NULL, TYPE_CHARDEV_GDB, + mon_chr = qemu_chardev_new(NULL, TYPE_GDB_CHARDEV, NULL, NULL, &error_abort); monitor_init_hmp(mon_chr, false, &error_abort); } else { diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 51f1747c4a..f656fb38a7 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -388,7 +388,7 @@ vhost_user_gpu_do_set_socket(VhostUserGPU *g, Error **errp) return false; } - chr = CHARDEV(object_new(TYPE_CHARDEV_SOCKET)); + chr = CHARDEV(object_new(TYPE_SOCKET_CHARDEV)); if (!chr || qemu_chr_add_client(chr, sv[0]) == -1) { error_setg(errp, "Failed to make socket chardev"); goto err; diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..2b2135ec77 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1232,7 +1232,7 @@ static void char_file_fifo_test(void) ret = write(fd, "fifo-in", 8); g_assert_cmpint(ret, ==, 8); - chr = qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, + chr = qemu_chardev_new("label-file", TYPE_FILE_CHARDEV, &backend, NULL, &error_abort); qemu_chr_fe_init(&be, chr, &error_abort); @@ -1286,7 +1286,7 @@ static void char_file_test_internal(Chardev *ext_chr, const char *filepath) } else { out = g_build_filename(tmp_path, "out", NULL); file.out = out; - chr = qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + chr = qemu_chardev_new(NULL, TYPE_FILE_CHARDEV, &backend, NULL, &error_abort); } ret = qemu_chr_write_all(chr, (uint8_t *)"hello!", 6); diff --git a/ui/console.c b/ui/console.c index f8d7643fe4..965f01e804 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1089,9 +1089,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) static int vc_chr_write(Chardev *chr, const uint8_t *buf, int len) { @@ -2403,7 +2403,7 @@ static void char_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_vc_type_info = { - .name = TYPE_CHARDEV_VC, + .name = TYPE_VC_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_vc_class_init, @@ -2412,7 +2412,7 @@ static const TypeInfo char_vc_type_info = { void qemu_console_early_init(void) { /* set the default vc driver */ - if (!object_class_by_name(TYPE_CHARDEV_VC)) { + if (!object_class_by_name(TYPE_VC_CHARDEV)) { type_register(&char_vc_type_info); } } diff --git a/ui/gtk.c b/ui/gtk.c index 1c59de2af4..2734f88e78 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -178,9 +178,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) bool gtk_use_gl_area; @@ -1743,7 +1743,7 @@ static void char_gd_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_gd_vc_type_info = { - .name = TYPE_CHARDEV_VC, + .name = TYPE_VC_CHARDEV, .parent = TYPE_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_gd_vc_class_init, diff --git a/ui/spice-app.c b/ui/spice-app.c index 93e105c6ee..e69dc21c78 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -46,9 +46,9 @@ struct VCChardev { }; typedef struct VCChardev VCChardev; -#define TYPE_CHARDEV_VC "chardev-vc" +#define TYPE_VC_CHARDEV "chardev-vc" DECLARE_INSTANCE_CHECKER(VCChardev, VC_CHARDEV, - TYPE_CHARDEV_VC) + TYPE_VC_CHARDEV) static ChardevBackend * chr_spice_backend_new(void) @@ -99,8 +99,8 @@ static void char_vc_class_init(ObjectClass *oc, void *data) } static const TypeInfo char_vc_type_info = { - .name = TYPE_CHARDEV_VC, - .parent = TYPE_CHARDEV_SPICEPORT, + .name = TYPE_VC_CHARDEV, + .parent = TYPE_SPICEPORT_CHARDEV, .instance_size = sizeof(VCChardev), .class_init = char_vc_class_init, }; @@ -166,7 +166,7 @@ static void spice_app_display_early_init(DisplayOptions *opts) display_opengl = opts->has_gl; #endif be->u.spiceport.data->fqdn = g_strdup("org.qemu.monitor.qmp.0"); - qemu_chardev_new("org.qemu.monitor.qmp", TYPE_CHARDEV_SPICEPORT, + qemu_chardev_new("org.qemu.monitor.qmp", TYPE_SPICEPORT_CHARDEV, be, NULL, &error_abort); qopts = qemu_opts_create(qemu_find_opts("mon"), NULL, 0, &error_fatal);

[PULL,15/34] chardev: Rename TYPE_CHARDEV_* to TYPE_*_CHARDEV

Commit Message

Patch