diff mbox series

[17/18] chardev: Rename WIN_CHARDEV to CHARDEV_WIN

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

Commit Message

Eduardo Habkost Sept. 10, 2020, 7:49 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>
---
 include/chardev/char-win.h |  2 +-
 chardev/char-pipe.c        |  2 +-
 chardev/char-win.c         | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/include/chardev/char-win.h b/include/chardev/char-win.h
index 485521469c..0e718d60c4 100644
--- a/include/chardev/char-win.h
+++ b/include/chardev/char-win.h
@@ -44,7 +44,7 @@  typedef struct WinChardev WinChardev;
 #define NRECVBUF 2048
 
 #define TYPE_CHARDEV_WIN "chardev-win"
-DECLARE_INSTANCE_CHECKER(WinChardev, WIN_CHARDEV,
+DECLARE_INSTANCE_CHECKER(WinChardev, CHARDEV_WIN,
                          TYPE_CHARDEV_WIN)
 
 void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open);
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index fd12c9e63b..96854cfe99 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -43,7 +43,7 @@ 
 static int win_chr_pipe_init(Chardev *chr, const char *filename,
                              Error **errp)
 {
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
     OVERLAPPED ov;
     int ret;
     DWORD size;
diff --git a/chardev/char-win.c b/chardev/char-win.c
index d4fb44c4dc..39cfd12177 100644
--- a/chardev/char-win.c
+++ b/chardev/char-win.c
@@ -30,7 +30,7 @@ 
 
 static void win_chr_read(Chardev *chr, DWORD len)
 {
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
     int max_size = qemu_chr_be_can_write(chr);
     int ret, err;
     uint8_t buf[CHR_READ_BUF_LEN];
@@ -61,7 +61,7 @@  static void win_chr_read(Chardev *chr, DWORD len)
 static int win_chr_serial_poll(void *opaque)
 {
     Chardev *chr = CHARDEV(opaque);
-    WinChardev *s = WIN_CHARDEV(opaque);
+    WinChardev *s = CHARDEV_WIN(opaque);
     COMSTAT status;
     DWORD comerr;
 
@@ -75,7 +75,7 @@  static int win_chr_serial_poll(void *opaque)
 
 int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp)
 {
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
     COMMCONFIG comcfg;
     COMMTIMEOUTS cto = { 0, 0, 0, 0, 0};
     COMSTAT comstat;
@@ -142,7 +142,7 @@  int win_chr_serial_init(Chardev *chr, const char *filename, Error **errp)
 int win_chr_pipe_poll(void *opaque)
 {
     Chardev *chr = CHARDEV(opaque);
-    WinChardev *s = WIN_CHARDEV(opaque);
+    WinChardev *s = CHARDEV_WIN(opaque);
     DWORD size;
 
     PeekNamedPipe(s->file, NULL, 0, NULL, &size, NULL);
@@ -156,7 +156,7 @@  int win_chr_pipe_poll(void *opaque)
 /* Called with chr_write_lock held.  */
 static int win_chr_write(Chardev *chr, const uint8_t *buf, int len1)
 {
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
     DWORD len, ret, size, err;
 
     len = len1;
@@ -192,7 +192,7 @@  static int win_chr_write(Chardev *chr, const uint8_t *buf, int len1)
 static void char_win_finalize(Object *obj)
 {
     Chardev *chr = CHARDEV(obj);
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
 
     if (s->hsend) {
         CloseHandle(s->hsend);
@@ -214,7 +214,7 @@  static void char_win_finalize(Object *obj)
 
 void win_chr_set_file(Chardev *chr, HANDLE file, bool keep_open)
 {
-    WinChardev *s = WIN_CHARDEV(chr);
+    WinChardev *s = CHARDEV_WIN(chr);
 
     s->keep_open = keep_open;
     s->file = file;