mirror of https://github.com/xemu-project/xemu.git
char: set name for all I/O channels created
Ensure that all I/O channels created for character devices are given names to distinguish their respective roles. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
0d73f7253e
commit
e93a68e102
|
@ -309,6 +309,10 @@ static inline void g_source_set_name(GSource *source, const char *name)
|
||||||
{
|
{
|
||||||
/* This is just a debugging aid, so leaving it a no-op */
|
/* This is just a debugging aid, so leaving it a no-op */
|
||||||
}
|
}
|
||||||
|
static inline void g_source_set_name_by_id(guint tag, const char *name)
|
||||||
|
{
|
||||||
|
/* This is just a debugging aid, so leaving it a no-op */
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
77
qemu-char.c
77
qemu-char.c
|
@ -934,7 +934,8 @@ static GSourceFuncs io_watch_poll_funcs = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Can only be used for read */
|
/* Can only be used for read */
|
||||||
static guint io_add_watch_poll(QIOChannel *ioc,
|
static guint io_add_watch_poll(CharDriverState *chr,
|
||||||
|
QIOChannel *ioc,
|
||||||
IOCanReadHandler *fd_can_read,
|
IOCanReadHandler *fd_can_read,
|
||||||
QIOChannelFunc fd_read,
|
QIOChannelFunc fd_read,
|
||||||
gpointer user_data,
|
gpointer user_data,
|
||||||
|
@ -942,6 +943,7 @@ static guint io_add_watch_poll(QIOChannel *ioc,
|
||||||
{
|
{
|
||||||
IOWatchPoll *iwp;
|
IOWatchPoll *iwp;
|
||||||
int tag;
|
int tag;
|
||||||
|
char *name;
|
||||||
|
|
||||||
iwp = (IOWatchPoll *) g_source_new(&io_watch_poll_funcs,
|
iwp = (IOWatchPoll *) g_source_new(&io_watch_poll_funcs,
|
||||||
sizeof(IOWatchPoll));
|
sizeof(IOWatchPoll));
|
||||||
|
@ -952,6 +954,10 @@ static guint io_add_watch_poll(QIOChannel *ioc,
|
||||||
iwp->src = NULL;
|
iwp->src = NULL;
|
||||||
iwp->context = context;
|
iwp->context = context;
|
||||||
|
|
||||||
|
name = g_strdup_printf("chardev-iowatch-%s", chr->label);
|
||||||
|
g_source_set_name((GSource *)iwp, name);
|
||||||
|
g_free(name);
|
||||||
|
|
||||||
tag = g_source_attach(&iwp->parent, context);
|
tag = g_source_attach(&iwp->parent, context);
|
||||||
g_source_unref(&iwp->parent);
|
g_source_unref(&iwp->parent);
|
||||||
return tag;
|
return tag;
|
||||||
|
@ -1091,7 +1097,7 @@ static void fd_chr_update_read_handler(CharDriverState *chr,
|
||||||
|
|
||||||
remove_fd_in_watch(chr);
|
remove_fd_in_watch(chr);
|
||||||
if (s->ioc_in) {
|
if (s->ioc_in) {
|
||||||
chr->fd_in_tag = io_add_watch_poll(s->ioc_in,
|
chr->fd_in_tag = io_add_watch_poll(chr, s->ioc_in,
|
||||||
fd_chr_read_poll,
|
fd_chr_read_poll,
|
||||||
fd_chr_read, chr,
|
fd_chr_read, chr,
|
||||||
context);
|
context);
|
||||||
|
@ -1120,6 +1126,7 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out,
|
||||||
{
|
{
|
||||||
CharDriverState *chr;
|
CharDriverState *chr;
|
||||||
FDCharDriver *s;
|
FDCharDriver *s;
|
||||||
|
char *name;
|
||||||
|
|
||||||
chr = qemu_chr_alloc(backend, errp);
|
chr = qemu_chr_alloc(backend, errp);
|
||||||
if (!chr) {
|
if (!chr) {
|
||||||
|
@ -1127,7 +1134,13 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out,
|
||||||
}
|
}
|
||||||
s = g_new0(FDCharDriver, 1);
|
s = g_new0(FDCharDriver, 1);
|
||||||
s->ioc_in = QIO_CHANNEL(qio_channel_file_new_fd(fd_in));
|
s->ioc_in = QIO_CHANNEL(qio_channel_file_new_fd(fd_in));
|
||||||
|
name = g_strdup_printf("chardev-file-in-%s", chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(s->ioc_in), name);
|
||||||
|
g_free(name);
|
||||||
s->ioc_out = QIO_CHANNEL(qio_channel_file_new_fd(fd_out));
|
s->ioc_out = QIO_CHANNEL(qio_channel_file_new_fd(fd_out));
|
||||||
|
name = g_strdup_printf("chardev-file-out-%s", chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(s->ioc_out), name);
|
||||||
|
g_free(name);
|
||||||
qemu_set_nonblock(fd_out);
|
qemu_set_nonblock(fd_out);
|
||||||
s->chr = chr;
|
s->chr = chr;
|
||||||
chr->opaque = s;
|
chr->opaque = s;
|
||||||
|
@ -1305,6 +1318,7 @@ static gboolean pty_chr_timer(gpointer opaque)
|
||||||
static void pty_chr_rearm_timer(CharDriverState *chr, int ms)
|
static void pty_chr_rearm_timer(CharDriverState *chr, int ms)
|
||||||
{
|
{
|
||||||
PtyCharDriver *s = chr->opaque;
|
PtyCharDriver *s = chr->opaque;
|
||||||
|
char *name;
|
||||||
|
|
||||||
if (s->timer_tag) {
|
if (s->timer_tag) {
|
||||||
g_source_remove(s->timer_tag);
|
g_source_remove(s->timer_tag);
|
||||||
|
@ -1312,10 +1326,14 @@ static void pty_chr_rearm_timer(CharDriverState *chr, int ms)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ms == 1000) {
|
if (ms == 1000) {
|
||||||
|
name = g_strdup_printf("pty-timer-secs-%s", chr->label);
|
||||||
s->timer_tag = g_timeout_add_seconds(1, pty_chr_timer, chr);
|
s->timer_tag = g_timeout_add_seconds(1, pty_chr_timer, chr);
|
||||||
} else {
|
} else {
|
||||||
|
name = g_strdup_printf("pty-timer-ms-%s", chr->label);
|
||||||
s->timer_tag = g_timeout_add(ms, pty_chr_timer, chr);
|
s->timer_tag = g_timeout_add(ms, pty_chr_timer, chr);
|
||||||
}
|
}
|
||||||
|
g_source_set_name_by_id(s->timer_tag, name);
|
||||||
|
g_free(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Called with chr_write_lock held. */
|
/* Called with chr_write_lock held. */
|
||||||
|
@ -1444,7 +1462,7 @@ static void pty_chr_state(CharDriverState *chr, int connected)
|
||||||
s->open_tag = g_idle_add(qemu_chr_be_generic_open_func, chr);
|
s->open_tag = g_idle_add(qemu_chr_be_generic_open_func, chr);
|
||||||
}
|
}
|
||||||
if (!chr->fd_in_tag) {
|
if (!chr->fd_in_tag) {
|
||||||
chr->fd_in_tag = io_add_watch_poll(s->ioc,
|
chr->fd_in_tag = io_add_watch_poll(chr, s->ioc,
|
||||||
pty_chr_read_poll,
|
pty_chr_read_poll,
|
||||||
pty_chr_read,
|
pty_chr_read,
|
||||||
chr, NULL);
|
chr, NULL);
|
||||||
|
@ -1478,6 +1496,7 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
|
||||||
int master_fd, slave_fd;
|
int master_fd, slave_fd;
|
||||||
char pty_name[PATH_MAX];
|
char pty_name[PATH_MAX];
|
||||||
ChardevCommon *common = backend->u.pty.data;
|
ChardevCommon *common = backend->u.pty.data;
|
||||||
|
char *name;
|
||||||
|
|
||||||
master_fd = qemu_openpty_raw(&slave_fd, pty_name);
|
master_fd = qemu_openpty_raw(&slave_fd, pty_name);
|
||||||
if (master_fd < 0) {
|
if (master_fd < 0) {
|
||||||
|
@ -1510,6 +1529,9 @@ static CharDriverState *qemu_chr_open_pty(const char *id,
|
||||||
chr->explicit_be_open = true;
|
chr->explicit_be_open = true;
|
||||||
|
|
||||||
s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
|
s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
|
||||||
|
name = g_strdup_printf("chardev-pty-%s", chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(s->ioc), name);
|
||||||
|
g_free(name);
|
||||||
s->timer_tag = 0;
|
s->timer_tag = 0;
|
||||||
|
|
||||||
return chr;
|
return chr;
|
||||||
|
@ -2596,7 +2618,7 @@ static void udp_chr_update_read_handler(CharDriverState *chr,
|
||||||
|
|
||||||
remove_fd_in_watch(chr);
|
remove_fd_in_watch(chr);
|
||||||
if (s->ioc) {
|
if (s->ioc) {
|
||||||
chr->fd_in_tag = io_add_watch_poll(s->ioc,
|
chr->fd_in_tag = io_add_watch_poll(chr, s->ioc,
|
||||||
udp_chr_read_poll,
|
udp_chr_read_poll,
|
||||||
udp_chr_read, chr,
|
udp_chr_read, chr,
|
||||||
context);
|
context);
|
||||||
|
@ -2673,9 +2695,13 @@ static gboolean socket_reconnect_timeout(gpointer opaque);
|
||||||
static void qemu_chr_socket_restart_timer(CharDriverState *chr)
|
static void qemu_chr_socket_restart_timer(CharDriverState *chr)
|
||||||
{
|
{
|
||||||
TCPCharDriver *s = chr->opaque;
|
TCPCharDriver *s = chr->opaque;
|
||||||
|
char *name;
|
||||||
assert(s->connected == 0);
|
assert(s->connected == 0);
|
||||||
s->reconnect_timer = g_timeout_add_seconds(s->reconnect_time,
|
s->reconnect_timer = g_timeout_add_seconds(s->reconnect_time,
|
||||||
socket_reconnect_timeout, chr);
|
socket_reconnect_timeout, chr);
|
||||||
|
name = g_strdup_printf("chardev-socket-reconnect-%s", chr->label);
|
||||||
|
g_source_set_name_by_id(s->reconnect_timer, name);
|
||||||
|
g_free(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_report_connect_error(CharDriverState *chr,
|
static void check_report_connect_error(CharDriverState *chr,
|
||||||
|
@ -3000,7 +3026,7 @@ static void tcp_chr_connect(void *opaque)
|
||||||
|
|
||||||
s->connected = 1;
|
s->connected = 1;
|
||||||
if (s->ioc) {
|
if (s->ioc) {
|
||||||
chr->fd_in_tag = io_add_watch_poll(s->ioc,
|
chr->fd_in_tag = io_add_watch_poll(chr, s->ioc,
|
||||||
tcp_chr_read_poll,
|
tcp_chr_read_poll,
|
||||||
tcp_chr_read,
|
tcp_chr_read,
|
||||||
chr, NULL);
|
chr, NULL);
|
||||||
|
@ -3019,7 +3045,7 @@ static void tcp_chr_update_read_handler(CharDriverState *chr,
|
||||||
|
|
||||||
remove_fd_in_watch(chr);
|
remove_fd_in_watch(chr);
|
||||||
if (s->ioc) {
|
if (s->ioc) {
|
||||||
chr->fd_in_tag = io_add_watch_poll(s->ioc,
|
chr->fd_in_tag = io_add_watch_poll(chr, s->ioc,
|
||||||
tcp_chr_read_poll,
|
tcp_chr_read_poll,
|
||||||
tcp_chr_read, chr,
|
tcp_chr_read, chr,
|
||||||
context);
|
context);
|
||||||
|
@ -3117,6 +3143,7 @@ static void tcp_chr_tls_init(CharDriverState *chr)
|
||||||
TCPCharDriver *s = chr->opaque;
|
TCPCharDriver *s = chr->opaque;
|
||||||
QIOChannelTLS *tioc;
|
QIOChannelTLS *tioc;
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
|
gchar *name;
|
||||||
|
|
||||||
if (s->is_listen) {
|
if (s->is_listen) {
|
||||||
tioc = qio_channel_tls_new_server(
|
tioc = qio_channel_tls_new_server(
|
||||||
|
@ -3134,6 +3161,11 @@ static void tcp_chr_tls_init(CharDriverState *chr)
|
||||||
tcp_chr_disconnect(chr);
|
tcp_chr_disconnect(chr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
name = g_strdup_printf("chardev-tls-%s-%s",
|
||||||
|
s->is_listen ? "server" : "client",
|
||||||
|
chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(tioc), name);
|
||||||
|
g_free(name);
|
||||||
object_unref(OBJECT(s->ioc));
|
object_unref(OBJECT(s->ioc));
|
||||||
s->ioc = QIO_CHANNEL(tioc);
|
s->ioc = QIO_CHANNEL(tioc);
|
||||||
|
|
||||||
|
@ -3144,6 +3176,19 @@ static void tcp_chr_tls_init(CharDriverState *chr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void tcp_chr_set_client_ioc_name(CharDriverState *chr,
|
||||||
|
QIOChannelSocket *sioc)
|
||||||
|
{
|
||||||
|
TCPCharDriver *s = chr->opaque;
|
||||||
|
char *name;
|
||||||
|
name = g_strdup_printf("chardev-tcp-%s-%s",
|
||||||
|
s->is_listen ? "server" : "client",
|
||||||
|
chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
||||||
|
g_free(name);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
static int tcp_chr_new_client(CharDriverState *chr, QIOChannelSocket *sioc)
|
static int tcp_chr_new_client(CharDriverState *chr, QIOChannelSocket *sioc)
|
||||||
{
|
{
|
||||||
TCPCharDriver *s = chr->opaque;
|
TCPCharDriver *s = chr->opaque;
|
||||||
|
@ -3189,6 +3234,7 @@ static int tcp_chr_add_client(CharDriverState *chr, int fd)
|
||||||
if (!sioc) {
|
if (!sioc) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
tcp_chr_set_client_ioc_name(chr, sioc);
|
||||||
ret = tcp_chr_new_client(chr, sioc);
|
ret = tcp_chr_new_client(chr, sioc);
|
||||||
object_unref(OBJECT(sioc));
|
object_unref(OBJECT(sioc));
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -3230,6 +3276,7 @@ static int tcp_chr_wait_connected(CharDriverState *chr, Error **errp)
|
||||||
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NULL);
|
qio_channel_set_blocking(QIO_CHANNEL(s->listen_ioc), false, NULL);
|
||||||
} else {
|
} else {
|
||||||
sioc = qio_channel_socket_new();
|
sioc = qio_channel_socket_new();
|
||||||
|
tcp_chr_set_client_ioc_name(chr, sioc);
|
||||||
if (qio_channel_socket_connect_sync(sioc, s->addr, errp) < 0) {
|
if (qio_channel_socket_connect_sync(sioc, s->addr, errp) < 0) {
|
||||||
object_unref(OBJECT(sioc));
|
object_unref(OBJECT(sioc));
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -4443,6 +4490,7 @@ static gboolean socket_reconnect_timeout(gpointer opaque)
|
||||||
}
|
}
|
||||||
|
|
||||||
sioc = qio_channel_socket_new();
|
sioc = qio_channel_socket_new();
|
||||||
|
tcp_chr_set_client_ioc_name(chr, sioc);
|
||||||
qio_channel_socket_connect_async(sioc, s->addr,
|
qio_channel_socket_connect_async(sioc, s->addr,
|
||||||
qemu_chr_socket_connected,
|
qemu_chr_socket_connected,
|
||||||
chr, NULL);
|
chr, NULL);
|
||||||
|
@ -4544,12 +4592,19 @@ static CharDriverState *qmp_chardev_open_socket(const char *id,
|
||||||
|
|
||||||
if (s->reconnect_time) {
|
if (s->reconnect_time) {
|
||||||
sioc = qio_channel_socket_new();
|
sioc = qio_channel_socket_new();
|
||||||
|
tcp_chr_set_client_ioc_name(chr, sioc);
|
||||||
qio_channel_socket_connect_async(sioc, s->addr,
|
qio_channel_socket_connect_async(sioc, s->addr,
|
||||||
qemu_chr_socket_connected,
|
qemu_chr_socket_connected,
|
||||||
chr, NULL);
|
chr, NULL);
|
||||||
} else {
|
} else {
|
||||||
if (s->is_listen) {
|
if (s->is_listen) {
|
||||||
|
char *name;
|
||||||
sioc = qio_channel_socket_new();
|
sioc = qio_channel_socket_new();
|
||||||
|
|
||||||
|
name = g_strdup_printf("chardev-tcp-listener-%s", chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
||||||
|
g_free(name);
|
||||||
|
|
||||||
if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) {
|
if (qio_channel_socket_listen_sync(sioc, s->addr, errp) < 0) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
@ -4590,6 +4645,8 @@ static CharDriverState *qmp_chardev_open_udp(const char *id,
|
||||||
ChardevUdp *udp = backend->u.udp.data;
|
ChardevUdp *udp = backend->u.udp.data;
|
||||||
ChardevCommon *common = qapi_ChardevUdp_base(udp);
|
ChardevCommon *common = qapi_ChardevUdp_base(udp);
|
||||||
QIOChannelSocket *sioc = qio_channel_socket_new();
|
QIOChannelSocket *sioc = qio_channel_socket_new();
|
||||||
|
char *name;
|
||||||
|
CharDriverState *chr;
|
||||||
|
|
||||||
if (qio_channel_socket_dgram_sync(sioc,
|
if (qio_channel_socket_dgram_sync(sioc,
|
||||||
udp->local, udp->remote,
|
udp->local, udp->remote,
|
||||||
|
@ -4597,7 +4654,13 @@ static CharDriverState *qmp_chardev_open_udp(const char *id,
|
||||||
object_unref(OBJECT(sioc));
|
object_unref(OBJECT(sioc));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
return qemu_chr_open_udp(sioc, common, errp);
|
chr = qemu_chr_open_udp(sioc, common, errp);
|
||||||
|
|
||||||
|
name = g_strdup_printf("chardev-udp-%s", chr->label);
|
||||||
|
qio_channel_set_name(QIO_CHANNEL(sioc), name);
|
||||||
|
g_free(name);
|
||||||
|
|
||||||
|
return chr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue