[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] util/qemu-sockets: make keep-alive enabled by default
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 2/2] util/qemu-sockets: make keep-alive enabled by default |
Date: |
Wed, 8 Jul 2020 22:15:39 +0300 |
Keep-alive won't hurt, let's try to enable it even if not requested by
user.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
util/qemu-sockets.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index b961963472..f6851376f5 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -438,7 +438,8 @@ static struct addrinfo
*inet_parse_connect_saddr(InetSocketAddress *saddr,
*
* Handle keep_alive settings. If user specified settings explicitly, fail if
* can't set the settings. If user just enabled keep-alive, not specifying the
- * settings, try to set defaults but ignore failures.
+ * settings, try to set defaults but ignore failures. If keep-alive option is
+ * not specified, try to set it but ignore failures.
*/
static int inet_set_keepalive(int sock, bool has_keep_alive,
KeepAliveField *keep_alive, Error **errp)
@@ -447,8 +448,8 @@ static int inet_set_keepalive(int sock, bool has_keep_alive,
int val;
bool has_settings = has_keep_alive && keep_alive->type == QTYPE_QDICT;
- if (!has_keep_alive || (keep_alive->type == QTYPE_QBOOL &&
- !keep_alive->u.enabled))
+ if (has_keep_alive &&
+ keep_alive->type == QTYPE_QBOOL && !keep_alive->u.enabled)
{
return 0;
}
@@ -456,8 +457,12 @@ static int inet_set_keepalive(int sock, bool
has_keep_alive,
val = 1;
ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
if (ret < 0) {
- error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
- return -1;
+ if (has_keep_alive) {
+ error_setg_errno(errp, errno, "Unable to set KEEPALIVE");
+ return -1;
+ } else {
+ return 0;
+ }
}
val = has_settings ? keep_alive->u.settings.idle : 30;
--
2.21.0
- [PATCH 0/2] keepalive default, Vladimir Sementsov-Ogievskiy, 2020/07/08
- [PATCH 2/2] util/qemu-sockets: make keep-alive enabled by default,
Vladimir Sementsov-Ogievskiy <=
[PATCH 1/2] sockets: keep-alive settings, Vladimir Sementsov-Ogievskiy, 2020/07/08
Re: [PATCH 0/2] keepalive default, no-reply, 2020/07/08
Re: [PATCH 0/2] keepalive default, Daniel P . Berrangé, 2020/07/09