Rename the types to follow the name of the chardev kind.
- socket: TCPChardev -> SocketChardev
- udp: NetChardev -> UdpChardev
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
---
qemu-char.c | 74 ++++++++++++++++++++++++++++++-------------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 24169a95b5..9220001906 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2683,12 +2683,12 @@ typedef struct {
int bufcnt;
int bufptr;
int max_size;
-} NetChardev;
+} UdpChardev;
/* Called with chr_write_lock held. */
static int udp_chr_write(Chardev *chr, const uint8_t *buf, int len)
{
- NetChardev *s = (NetChardev *)chr;
+ UdpChardev *s = (UdpChardev *)chr;
return qio_channel_write(
s->ioc, (const char *)buf, len, NULL);
@@ -2697,7 +2697,7 @@ static int udp_chr_write(Chardev *chr, const uint8_t
*buf, int len)
static int udp_chr_read_poll(void *opaque)
{
Chardev *chr = opaque;
- NetChardev *s = opaque;
+ UdpChardev *s = opaque;
s->max_size = qemu_chr_be_can_write(chr);
@@ -2715,7 +2715,7 @@ static int udp_chr_read_poll(void *opaque)
static gboolean udp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
{
Chardev *chr = opaque;
- NetChardev *s = opaque;
+ UdpChardev *s = opaque;
ssize_t ret;
if (s->max_size == 0) {
@@ -2742,7 +2742,7 @@ static gboolean udp_chr_read(QIOChannel *chan,
GIOCondition cond, void *opaque)
static void udp_chr_update_read_handler(Chardev *chr,
GMainContext *context)
{
- NetChardev *s = (NetChardev *)chr;
+ UdpChardev *s = (UdpChardev *)chr;
remove_fd_in_watch(chr);
if (s->ioc) {
@@ -2755,7 +2755,7 @@ static void udp_chr_update_read_handler(Chardev *chr,
static void udp_chr_free(Chardev *chr)
{
- NetChardev *s = (NetChardev *)chr;
+ UdpChardev *s = (UdpChardev *)chr;
remove_fd_in_watch(chr);
if (s->ioc) {
@@ -2791,13 +2791,13 @@ typedef struct {
guint reconnect_timer;
int64_t reconnect_time;
bool connect_err_reported;
-} TCPChardev;
+} SocketChardev;
static gboolean socket_reconnect_timeout(gpointer opaque);
static void qemu_chr_socket_restart_timer(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
char *name;
assert(s->connected == 0);
@@ -2811,7 +2811,7 @@ static void qemu_chr_socket_restart_timer(Chardev *chr)
static void check_report_connect_error(Chardev *chr,
Error *err)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (!s->connect_err_reported) {
error_report("Unable to connect character device %s: %s",
@@ -2828,7 +2828,7 @@ static gboolean tcp_chr_accept(QIOChannel *chan,
/* Called with chr_write_lock held. */
static int tcp_chr_write(Chardev *chr, const uint8_t *buf, int len)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (s->connected) {
int ret = io_channel_send_full(s->ioc, buf, len,
@@ -2852,7 +2852,7 @@ static int tcp_chr_write(Chardev *chr, const uint8_t
*buf, int len)
static int tcp_chr_read_poll(void *opaque)
{
Chardev *chr = opaque;
- TCPChardev *s = opaque;
+ SocketChardev *s = opaque;
if (!s->connected)
return 0;
s->max_size = qemu_chr_be_can_write(chr);
@@ -2862,7 +2862,7 @@ static int tcp_chr_read_poll(void *opaque)
#define IAC 255
#define IAC_BREAK 243
static void tcp_chr_process_IAC_bytes(Chardev *chr,
- TCPChardev *s,
+ SocketChardev *s,
uint8_t *buf, int *size)
{
/* Handle any telnet client's basic IAC options to satisfy char by
@@ -2911,7 +2911,7 @@ static void tcp_chr_process_IAC_bytes(Chardev *chr,
static int tcp_get_msgfds(Chardev *chr, int *fds, int num)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
int to_copy = (s->read_msgfds_num < num) ? s->read_msgfds_num : num;
@@ -2937,7 +2937,7 @@ static int tcp_get_msgfds(Chardev *chr, int *fds, int num)
static int tcp_set_msgfds(Chardev *chr, int *fds, int num)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
/* clear old pending fd array */
g_free(s->write_msgfds);
@@ -2962,7 +2962,7 @@ static int tcp_set_msgfds(Chardev *chr, int *fds, int num)
static ssize_t tcp_chr_recv(Chardev *chr, char *buf, size_t len)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
struct iovec iov = { .iov_base = buf, .iov_len = len };
int ret;
size_t i;
@@ -3019,13 +3019,13 @@ static ssize_t tcp_chr_recv(Chardev *chr, char *buf,
size_t len)
static GSource *tcp_chr_add_watch(Chardev *chr, GIOCondition cond)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
return qio_channel_create_watch(s->ioc, cond);
}
static void tcp_chr_free_connection(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
int i;
if (!s->connected) {
@@ -3054,7 +3054,7 @@ static void tcp_chr_free_connection(Chardev *chr)
static void tcp_chr_disconnect(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (!s->connected) {
return;
@@ -3077,7 +3077,7 @@ static void tcp_chr_disconnect(Chardev *chr)
static gboolean tcp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque)
{
Chardev *chr = opaque;
- TCPChardev *s = opaque;
+ SocketChardev *s = opaque;
uint8_t buf[READ_BUF_LEN];
int len, size;
@@ -3103,7 +3103,7 @@ static gboolean tcp_chr_read(QIOChannel *chan,
GIOCondition cond, void *opaque)
static int tcp_chr_sync_read(Chardev *chr, const uint8_t *buf, int len)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
int size;
if (!s->connected) {
@@ -3122,7 +3122,7 @@ static int tcp_chr_sync_read(Chardev *chr, const uint8_t
*buf, int len)
static void tcp_chr_connect(void *opaque)
{
Chardev *chr = opaque;
- TCPChardev *s = opaque;
+ SocketChardev *s = opaque;
g_free(chr->filename);
chr->filename = sockaddr_to_str(
@@ -3143,7 +3143,7 @@ static void tcp_chr_connect(void *opaque)
static void tcp_chr_update_read_handler(Chardev *chr,
GMainContext *context)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (!s->connected) {
return;
@@ -3194,7 +3194,7 @@ static gboolean tcp_chr_telnet_init_io(QIOChannel *ioc,
static void tcp_chr_telnet_init(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
TCPCharDriverTelnetInit *init =
g_new0(TCPCharDriverTelnetInit, 1);
size_t n = 0;
@@ -3230,7 +3230,7 @@ static void tcp_chr_tls_handshake(Object *source,
gpointer user_data)
{
Chardev *chr = user_data;
- TCPChardev *s = user_data;
+ SocketChardev *s = user_data;
if (err) {
tcp_chr_disconnect(chr);
@@ -3246,7 +3246,7 @@ static void tcp_chr_tls_handshake(Object *source,
static void tcp_chr_tls_init(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
QIOChannelTLS *tioc;
Error *err = NULL;
gchar *name;
@@ -3285,7 +3285,7 @@ static void tcp_chr_tls_init(Chardev *chr)
static void tcp_chr_set_client_ioc_name(Chardev *chr,
QIOChannelSocket *sioc)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
char *name;
name = g_strdup_printf("chardev-tcp-%s-%s",
s->is_listen ? "server" : "client",
@@ -3297,7 +3297,7 @@ static void tcp_chr_set_client_ioc_name(Chardev *chr,
static int tcp_chr_new_client(Chardev *chr, QIOChannelSocket *sioc)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (s->ioc != NULL) {
return -1;
@@ -3369,7 +3369,7 @@ static gboolean tcp_chr_accept(QIOChannel *channel,
static int tcp_chr_wait_connected(Chardev *chr, Error **errp)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
QIOChannelSocket *sioc;
/* It can't wait on s->connected, since it is set asynchronously
@@ -3417,7 +3417,7 @@ int qemu_chr_fe_wait_connected(CharBackend *be, Error
**errp)
static void tcp_chr_free(Chardev *chr)
{
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
tcp_chr_free_connection(chr);
@@ -3445,7 +3445,7 @@ static void qemu_chr_socket_connected(Object *src, Error
*err, void *opaque)
{
QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(src);
Chardev *chr = opaque;
- TCPChardev *s = (TCPChardev *)chr;
+ SocketChardev *s = (SocketChardev *)chr;
if (err) {
check_report_connect_error(chr, err);
@@ -4718,7 +4718,7 @@ static const CharDriver serial_driver = {
static gboolean socket_reconnect_timeout(gpointer opaque)
{
Chardev *chr = opaque;
- TCPChardev *s = opaque;
+ SocketChardev *s = opaque;
QIOChannelSocket *sioc;
s->reconnect_timer = 0;
@@ -4744,7 +4744,7 @@ static Chardev *qmp_chardev_open_socket(const CharDriver
*driver,
Error **errp)
{
Chardev *chr;
- TCPChardev *s;
+ SocketChardev *s;
ChardevSocket *sock = backend->u.socket.data;
SocketAddress *addr = sock->addr;
bool do_nodelay = sock->has_nodelay ? sock->nodelay : false;
@@ -4759,7 +4759,7 @@ static Chardev *qmp_chardev_open_socket(const CharDriver
*driver,
if (!chr) {
return NULL;
}
- s = (TCPChardev *)chr;
+ s = (SocketChardev *)chr;
s->is_unix = addr->type == SOCKET_ADDRESS_KIND_UNIX;
s->is_listen = is_listen;
@@ -4866,7 +4866,7 @@ static Chardev *qmp_chardev_open_socket(const CharDriver
*driver,
}
static const CharDriver socket_driver = {
- .instance_size = sizeof(TCPChardev),
+ .instance_size = sizeof(SocketChardev),
.kind = CHARDEV_BACKEND_KIND_SOCKET,
.parse = qemu_chr_parse_socket, .create = qmp_chardev_open_socket,
.chr_wait_connected = tcp_chr_wait_connected,
@@ -4893,7 +4893,7 @@ static Chardev *qmp_chardev_open_udp(const CharDriver
*driver,
QIOChannelSocket *sioc = qio_channel_socket_new();
char *name;
Chardev *chr;
- NetChardev *s;
+ UdpChardev *s;
if (qio_channel_socket_dgram_sync(sioc,
udp->local, udp->remote,
@@ -4911,7 +4911,7 @@ static Chardev *qmp_chardev_open_udp(const CharDriver
*driver,
qio_channel_set_name(QIO_CHANNEL(sioc), name);
g_free(name);
- s = (NetChardev *)chr;
+ s = (UdpChardev *)chr;
s->ioc = QIO_CHANNEL(sioc);
s->bufcnt = 0;
s->bufptr = 0;
@@ -4922,7 +4922,7 @@ static Chardev *qmp_chardev_open_udp(const CharDriver
*driver,
}
static const CharDriver udp_driver = {
- .instance_size = sizeof(NetChardev),
+ .instance_size = sizeof(UdpChardev),
.kind = CHARDEV_BACKEND_KIND_UDP,
.parse = qemu_chr_parse_udp, .create = qmp_chardev_open_udp,
.chr_write = udp_chr_write,
--
2.11.0
