[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/18] chardev: Rename WIN_CHARDEV to CHARDEV_WIN
From: |
Eduardo Habkost |
Subject: |
[PATCH 17/18] chardev: Rename WIN_CHARDEV to CHARDEV_WIN |
Date: |
Thu, 10 Sep 2020 15:49:02 -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-win.h | 2 +-
chardev/char-pipe.c | 2 +-
chardev/char-win.c | 14 +++++++-------
3 files changed, 9 insertions(+), 9 deletions(-)
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;
--
2.26.2
- [PATCH 07/18] chardev: Rename MUX_CHARDEV to CHARDEV_MUX, (continued)
- [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
- [PATCH 17/18] chardev: Rename WIN_CHARDEV to CHARDEV_WIN,
Eduardo Habkost <=
- [PATCH 18/18] chardev: Rename WIN_STDIO_CHARDEV to CHARDEV_WIN_STDIO, Eduardo Habkost, 2020/09/10
- Re: [PATCH 00/18] chardev: QOM cleanups, Marc-André Lureau, 2020/09/11