[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/18] chardev: Rename FD_CHARDEV to CHARDEV_FD
From: |
Eduardo Habkost |
Subject: |
[PATCH 06/18] chardev: Rename FD_CHARDEV to CHARDEV_FD |
Date: |
Thu, 10 Sep 2020 15:48:51 -0400 |
Rename instance and class type checkers to match the
TYPE_CHARDEV_* constant names and the QOM type name strings
("chardev-*").
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/chardev/char-fd.h | 2 +-
chardev/char-fd.c | 14 +++++++-------
chardev/char-serial.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/chardev/char-fd.h b/include/chardev/char-fd.h
index 9de0e440de..707f7f1700 100644
--- a/include/chardev/char-fd.h
+++ b/include/chardev/char-fd.h
@@ -38,7 +38,7 @@ typedef struct FDChardev FDChardev;
#define TYPE_CHARDEV_FD "chardev-fd"
-DECLARE_INSTANCE_CHECKER(FDChardev, FD_CHARDEV,
+DECLARE_INSTANCE_CHECKER(FDChardev, CHARDEV_FD,
TYPE_CHARDEV_FD)
void qemu_chr_open_fd(Chardev *chr, int fd_in, int fd_out);
diff --git a/chardev/char-fd.c b/chardev/char-fd.c
index c2d8101106..b1701c4e4a 100644
--- a/chardev/char-fd.c
+++ b/chardev/char-fd.c
@@ -36,7 +36,7 @@
/* Called with chr_write_lock held. */
static int fd_chr_write(Chardev *chr, const uint8_t *buf, int len)
{
- FDChardev *s = FD_CHARDEV(chr);
+ FDChardev *s = CHARDEV_FD(chr);
return io_channel_send(s->ioc_out, buf, len);
}
@@ -44,7 +44,7 @@ static int fd_chr_write(Chardev *chr, const uint8_t *buf, int
len)
static gboolean fd_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
{
Chardev *chr = CHARDEV(opaque);
- FDChardev *s = FD_CHARDEV(opaque);
+ FDChardev *s = CHARDEV_FD(opaque);
int len;
uint8_t buf[CHR_READ_BUF_LEN];
ssize_t ret;
@@ -74,7 +74,7 @@ static gboolean fd_chr_read(QIOChannel *chan, GIOCondition
cond, void *opaque)
static int fd_chr_read_poll(void *opaque)
{
Chardev *chr = CHARDEV(opaque);
- FDChardev *s = FD_CHARDEV(opaque);
+ FDChardev *s = CHARDEV_FD(opaque);
s->max_size = qemu_chr_be_can_write(chr);
return s->max_size;
@@ -82,13 +82,13 @@ static int fd_chr_read_poll(void *opaque)
static GSource *fd_chr_add_watch(Chardev *chr, GIOCondition cond)
{
- FDChardev *s = FD_CHARDEV(chr);
+ FDChardev *s = CHARDEV_FD(chr);
return qio_channel_create_watch(s->ioc_out, cond);
}
static void fd_chr_update_read_handler(Chardev *chr)
{
- FDChardev *s = FD_CHARDEV(chr);
+ FDChardev *s = CHARDEV_FD(chr);
remove_fd_in_watch(chr);
if (s->ioc_in) {
@@ -102,7 +102,7 @@ static void fd_chr_update_read_handler(Chardev *chr)
static void char_fd_finalize(Object *obj)
{
Chardev *chr = CHARDEV(obj);
- FDChardev *s = FD_CHARDEV(obj);
+ FDChardev *s = CHARDEV_FD(obj);
remove_fd_in_watch(chr);
if (s->ioc_in) {
@@ -130,7 +130,7 @@ int qmp_chardev_open_file_source(char *src, int flags,
Error **errp)
void qemu_chr_open_fd(Chardev *chr,
int fd_in, int fd_out)
{
- FDChardev *s = FD_CHARDEV(chr);
+ FDChardev *s = CHARDEV_FD(chr);
char *name;
s->ioc_in = QIO_CHANNEL(qio_channel_file_new_fd(fd_in));
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 7c3d84ae24..de1705d2a8 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -178,7 +178,7 @@ static void tty_serial_init(int fd, int speed,
static int tty_serial_ioctl(Chardev *chr, int cmd, void *arg)
{
- FDChardev *s = FD_CHARDEV(chr);
+ FDChardev *s = CHARDEV_FD(chr);
QIOChannelFile *fioc = QIO_CHANNEL_FILE(s->ioc_in);
switch (cmd) {
--
2.26.2
- [PATCH 00/18] chardev: QOM cleanups, Eduardo Habkost, 2020/09/10
- [PATCH 01/18] chardev: Move PARALLEL_CHARDEV macro to common code, Eduardo Habkost, 2020/09/10
- [PATCH 02/18] chardev: Move ParallelChardev typedef to common code, Eduardo Habkost, 2020/09/10
- [PATCH 03/18] chardev: Use DECLARE_INSTANCE_CHECKER macro for PARALLEL_CHARDEV, Eduardo Habkost, 2020/09/10
- [PATCH 04/18] chardev: Rename MOUSE_CHARDEV to CHARDEV_MSMOUSE, Eduardo Habkost, 2020/09/10
- [PATCH 05/18] chardev: Rename BAUM_CHARDEV to CHARDEV_BRAILLE, Eduardo Habkost, 2020/09/10
- [PATCH 06/18] chardev: Rename FD_CHARDEV to CHARDEV_FD,
Eduardo Habkost <=
- [PATCH 07/18] chardev: Rename MUX_CHARDEV to CHARDEV_MUX, Eduardo Habkost, 2020/09/10
- [PATCH 08/18] chardev: Rename PARALLEL_CHARDEV to CHARDEV_PARALLEL, Eduardo Habkost, 2020/09/10
- [PATCH 10/18] chardev: Rename RINGBUF_CHARDEV to CHARDEV_RINGBUF, Eduardo Habkost, 2020/09/10
- [PATCH 09/18] chardev: Rename PTY_CHARDEV to CHARDEV_PTY, Eduardo Habkost, 2020/09/10
- [PATCH 11/18] chardev: Rename SOCKET_CHARDEV to CHARDEV_SOCKET, Eduardo Habkost, 2020/09/10
- [PATCH 12/18] chardev: Rename SPICE_CHARDEV to CHARDEV_SPICE, Eduardo Habkost, 2020/09/10
- [PATCH 13/18] chardev: Rename TESTDEV_CHARDEV to CHARDEV_TESTDEV, Eduardo Habkost, 2020/09/10
- [PATCH 14/18] chardev: Rename UDP_CHARDEV to CHARDEV_UDP, Eduardo Habkost, 2020/09/10
- [PATCH 15/18] chardev: Rename VC_CHARDEV to CHARDEV_VC, Eduardo Habkost, 2020/09/10
- [PATCH 16/18] chardev: Rename WCTABLET_CHARDEV to CHARDEV_WCTABLET, Eduardo Habkost, 2020/09/10