diff mbox series

[07/18] chardev: Rename MUX_CHARDEV to CHARDEV_MUX

Message ID 20200910194903.4104696-8-ehabkost@redhat.com
State New
Headers show
Series chardev: QOM cleanups | expand

Commit Message

Eduardo Habkost Sept. 10, 2020, 7:48 p.m. UTC 
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>
---
 chardev/chardev-internal.h |  2 +-
 chardev/char-fe.c          |  4 ++--
 chardev/char-mux.c         | 22 +++++++++++-----------
 chardev/char.c             |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
diff mbox series

Patch

diff --git a/chardev/chardev-internal.h b/chardev/chardev-internal.h
index aba0240759..740d56bf94 100644
--- a/chardev/chardev-internal.h
+++ b/chardev/chardev-internal.h
@@ -54,7 +54,7 @@  struct MuxChardev {
 };
 typedef struct MuxChardev MuxChardev;
 
-DECLARE_INSTANCE_CHECKER(MuxChardev, MUX_CHARDEV,
+DECLARE_INSTANCE_CHECKER(MuxChardev, CHARDEV_MUX,
                          TYPE_CHARDEV_MUX)
 #define CHARDEV_IS_MUX(chr)                             \
     object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_MUX)
diff --git a/chardev/char-fe.c b/chardev/char-fe.c
index 474715c5a9..419835c340 100644
--- a/chardev/char-fe.c
+++ b/chardev/char-fe.c
@@ -196,7 +196,7 @@  bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Error **errp)
 
     if (s) {
         if (CHARDEV_IS_MUX(s)) {
-            MuxChardev *d = MUX_CHARDEV(s);
+            MuxChardev *d = CHARDEV_MUX(s);
 
             if (d->mux_cnt >= MAX_MUX) {
                 goto unavailable;
@@ -231,7 +231,7 @@  void qemu_chr_fe_deinit(CharBackend *b, bool del)
             b->chr->be = NULL;
         }
         if (CHARDEV_IS_MUX(b->chr)) {
-            MuxChardev *d = MUX_CHARDEV(b->chr);
+            MuxChardev *d = CHARDEV_MUX(b->chr);
             d->backends[b->tag] = NULL;
         }
         if (del) {
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 6f980bb836..a9dcbf2cc0 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -36,7 +36,7 @@ 
 /* Called with chr_write_lock held.  */
 static int mux_chr_write(Chardev *chr, const uint8_t *buf, int len)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
     int ret;
     if (!d->timestamps) {
         ret = qemu_chr_fe_write(&d->chr, buf, len);
@@ -128,7 +128,7 @@  static void mux_chr_send_event(MuxChardev *d, int mux_nr, QEMUChrEvent event)
 
 static void mux_chr_be_event(Chardev *chr, QEMUChrEvent event)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
 
     if (d->focus != -1) {
         mux_chr_send_event(d, d->focus, event);
@@ -182,7 +182,7 @@  static int mux_proc_byte(Chardev *chr, MuxChardev *d, int ch)
 
 static void mux_chr_accept_input(Chardev *chr)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
     int m = d->focus;
     CharBackend *be = d->backends[m];
 
@@ -195,7 +195,7 @@  static void mux_chr_accept_input(Chardev *chr)
 
 static int mux_chr_can_read(void *opaque)
 {
-    MuxChardev *d = MUX_CHARDEV(opaque);
+    MuxChardev *d = CHARDEV_MUX(opaque);
     int m = d->focus;
     CharBackend *be = d->backends[m];
 
@@ -213,7 +213,7 @@  static int mux_chr_can_read(void *opaque)
 static void mux_chr_read(void *opaque, const uint8_t *buf, int size)
 {
     Chardev *chr = CHARDEV(opaque);
-    MuxChardev *d = MUX_CHARDEV(opaque);
+    MuxChardev *d = CHARDEV_MUX(opaque);
     int m = d->focus;
     CharBackend *be = d->backends[m];
     int i;
@@ -234,7 +234,7 @@  static void mux_chr_read(void *opaque, const uint8_t *buf, int size)
 
 void mux_chr_send_all_event(Chardev *chr, QEMUChrEvent event)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
     int i;
 
     if (!machine_init_done) {
@@ -254,7 +254,7 @@  static void mux_chr_event(void *opaque, QEMUChrEvent event)
 
 static GSource *mux_chr_add_watch(Chardev *s, GIOCondition cond)
 {
-    MuxChardev *d = MUX_CHARDEV(s);
+    MuxChardev *d = CHARDEV_MUX(s);
     Chardev *chr = qemu_chr_fe_get_driver(&d->chr);
     ChardevClass *cc = CHARDEV_GET_CLASS(chr);
 
@@ -267,7 +267,7 @@  static GSource *mux_chr_add_watch(Chardev *s, GIOCondition cond)
 
 static void char_mux_finalize(Object *obj)
 {
-    MuxChardev *d = MUX_CHARDEV(obj);
+    MuxChardev *d = CHARDEV_MUX(obj);
     int i;
 
     for (i = 0; i < d->mux_cnt; i++) {
@@ -281,7 +281,7 @@  static void char_mux_finalize(Object *obj)
 
 static void mux_chr_update_read_handlers(Chardev *chr)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
 
     /* Fix up the real driver with mux routines */
     qemu_chr_fe_set_handlers_full(&d->chr,
@@ -295,7 +295,7 @@  static void mux_chr_update_read_handlers(Chardev *chr)
 
 void mux_set_focus(Chardev *chr, int focus)
 {
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
 
     assert(focus >= 0);
     assert(focus < d->mux_cnt);
@@ -316,7 +316,7 @@  static void qemu_chr_open_mux(Chardev *chr,
 {
     ChardevMux *mux = backend->u.mux.data;
     Chardev *drv;
-    MuxChardev *d = MUX_CHARDEV(chr);
+    MuxChardev *d = CHARDEV_MUX(chr);
 
     drv = qemu_chr_find(mux->chardev);
     if (drv == NULL) {
diff --git a/chardev/char.c b/chardev/char.c
index 77e7ec814f..43fb8bd50e 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -308,7 +308,7 @@  static const TypeInfo char_type_info = {
 static bool qemu_chr_is_busy(Chardev *s)
 {
     if (CHARDEV_IS_MUX(s)) {
-        MuxChardev *d = MUX_CHARDEV(s);
+        MuxChardev *d = CHARDEV_MUX(s);
         return d->mux_cnt >= 0;
     } else {
         return s->be != NULL;