diff options
| author | Daniel P. Berrangé | 2019-02-11 19:24:38 +0100 |
|---|---|---|
| committer | Marc-André Lureau | 2019-02-12 17:35:56 +0100 |
| commit | 25d93b6a116fcef9b4c7c7dcea2fab90dd7c88b5 (patch) | |
| tree | 7c1ef22852d6252d18a0303b744f0d2c0dcca359 /chardev | |
| parent | chardev: use a state machine for socket connection state (diff) | |
| download | qemu-25d93b6a116fcef9b4c7c7dcea2fab90dd7c88b5.tar.gz qemu-25d93b6a116fcef9b4c7c7dcea2fab90dd7c88b5.tar.xz qemu-25d93b6a116fcef9b4c7c7dcea2fab90dd7c88b5.zip | |
chardev: honour the reconnect setting in tcp_chr_wait_connected
If establishing a client connection fails, the tcp_chr_wait_connected
method should sleep for the reconnect timeout and then retry the
attempt. This ensures the callers don't immediately abort with an
error when the initial connection fails.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190211182442.8542-13-berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'chardev')
| -rw-r--r-- | chardev/char-socket.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index d6de5d2305..7db20ff0a0 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -957,8 +957,15 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp) if (s->is_listen) { tcp_chr_accept_server_sync(chr); } else { - if (tcp_chr_connect_client_sync(chr, errp) < 0) { - return -1; + Error *err = NULL; + if (tcp_chr_connect_client_sync(chr, &err) < 0) { + if (s->reconnect_time) { + error_free(err); + g_usleep(s->reconnect_time * 1000ULL * 1000ULL); + } else { + error_propagate(errp, err); + return -1; + } } } } |