char: remove socket_try_connect method
The qemu_chr_open_socket_fd() method multiplexes three different actions into one method. The socket_try_connect() method is one of its callers, but it only ever want one specific action performed. By inlining that action into socket_try_connect() we see that there is not in fact any failure scenario, so there is not even any reason for socket_try_connect to exist. Just inline the asynchronous connection attempts directly at the places that need them. This shortens & clarifies the code. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
f50dfe457f
commit
317856cac8
25
qemu-char.c
25
qemu-char.c
|
@ -3121,10 +3121,6 @@ static bool qemu_chr_open_socket_fd(CharDriverState *chr, Error **errp)
|
||||||
s->listen_ioc = sioc;
|
s->listen_ioc = sioc;
|
||||||
s->listen_tag = qio_channel_add_watch(
|
s->listen_tag = qio_channel_add_watch(
|
||||||
QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
|
QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
|
||||||
} else if (s->reconnect_time) {
|
|
||||||
qio_channel_socket_connect_async(sioc, s->addr,
|
|
||||||
qemu_chr_socket_connected,
|
|
||||||
chr, NULL);
|
|
||||||
} else {
|
} else {
|
||||||
if (qio_channel_socket_connect_sync(sioc, s->addr, errp) < 0) {
|
if (qio_channel_socket_connect_sync(sioc, s->addr, errp) < 0) {
|
||||||
goto fail;
|
goto fail;
|
||||||
|
@ -4248,19 +4244,11 @@ static CharDriverState *qmp_chardev_open_parallel(const char *id,
|
||||||
|
|
||||||
#endif /* WIN32 */
|
#endif /* WIN32 */
|
||||||
|
|
||||||
static void socket_try_connect(CharDriverState *chr)
|
|
||||||
{
|
|
||||||
Error *err = NULL;
|
|
||||||
|
|
||||||
if (!qemu_chr_open_socket_fd(chr, &err)) {
|
|
||||||
check_report_connect_error(chr, err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean socket_reconnect_timeout(gpointer opaque)
|
static gboolean socket_reconnect_timeout(gpointer opaque)
|
||||||
{
|
{
|
||||||
CharDriverState *chr = opaque;
|
CharDriverState *chr = opaque;
|
||||||
TCPCharDriver *s = chr->opaque;
|
TCPCharDriver *s = chr->opaque;
|
||||||
|
QIOChannelSocket *sioc;
|
||||||
|
|
||||||
s->reconnect_timer = 0;
|
s->reconnect_timer = 0;
|
||||||
|
|
||||||
|
@ -4268,7 +4256,10 @@ static gboolean socket_reconnect_timeout(gpointer opaque)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
socket_try_connect(chr);
|
sioc = qio_channel_socket_new();
|
||||||
|
qio_channel_socket_connect_async(sioc, s->addr,
|
||||||
|
qemu_chr_socket_connected,
|
||||||
|
chr, NULL);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -4288,6 +4279,7 @@ static CharDriverState *qmp_chardev_open_socket(const char *id,
|
||||||
bool is_waitconnect = sock->has_wait ? sock->wait : false;
|
bool is_waitconnect = sock->has_wait ? sock->wait : false;
|
||||||
int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
|
int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
|
||||||
ChardevCommon *common = qapi_ChardevSocket_base(sock);
|
ChardevCommon *common = qapi_ChardevSocket_base(sock);
|
||||||
|
QIOChannelSocket *sioc = NULL;
|
||||||
|
|
||||||
chr = qemu_chr_alloc(common, errp);
|
chr = qemu_chr_alloc(common, errp);
|
||||||
if (!chr) {
|
if (!chr) {
|
||||||
|
@ -4358,7 +4350,10 @@ static CharDriverState *qmp_chardev_open_socket(const char *id,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s->reconnect_time) {
|
if (s->reconnect_time) {
|
||||||
socket_try_connect(chr);
|
sioc = qio_channel_socket_new();
|
||||||
|
qio_channel_socket_connect_async(sioc, s->addr,
|
||||||
|
qemu_chr_socket_connected,
|
||||||
|
chr, NULL);
|
||||||
} else if (!qemu_chr_open_socket_fd(chr, errp)) {
|
} else if (!qemu_chr_open_socket_fd(chr, errp)) {
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue