From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49677) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae4NE-0002jW-BS for qemu-devel@nongnu.org; Thu, 10 Mar 2016 12:27:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae4N9-0001oe-Bp for qemu-devel@nongnu.org; Thu, 10 Mar 2016 12:27:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae4N9-0001oP-5M for qemu-devel@nongnu.org; Thu, 10 Mar 2016 12:27:39 -0500 From: "Daniel P. Berrange" Date: Thu, 10 Mar 2016 17:27:02 +0000 Message-Id: <1457630825-26638-16-git-send-email-berrange@redhat.com> In-Reply-To: <1457630825-26638-1-git-send-email-berrange@redhat.com> References: <1457630825-26638-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/18] char: remove socket_try_connect method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrew Baumann , Stefan Weil 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 Signed-off-by: Daniel P. Berrange --- qemu-char.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index fe212b4..1540463 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3121,10 +3121,6 @@ static bool qemu_chr_open_socket_fd(CharDriverState *chr, Error **errp) s->listen_ioc = sioc; s->listen_tag = qio_channel_add_watch( 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 { if (qio_channel_socket_connect_sync(sioc, s->addr, errp) < 0) { goto fail; @@ -4248,19 +4244,11 @@ static CharDriverState *qmp_chardev_open_parallel(const char *id, #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) { CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; + QIOChannelSocket *sioc; s->reconnect_timer = 0; @@ -4268,7 +4256,10 @@ static gboolean socket_reconnect_timeout(gpointer opaque) 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; } @@ -4288,6 +4279,7 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, bool is_waitconnect = sock->has_wait ? sock->wait : false; int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0; ChardevCommon *common = qapi_ChardevSocket_base(sock); + QIOChannelSocket *sioc = NULL; chr = qemu_chr_alloc(common, errp); if (!chr) { @@ -4358,7 +4350,10 @@ static CharDriverState *qmp_chardev_open_socket(const char *id, } 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)) { goto error; } -- 2.5.0