External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

remote: factor out feature checks on connection open

Browse Source 
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Nikolay Shirokovskiy 2016-02-17 15:15:01 +03:00 committed by Daniel P. Berrange
parent 88f09b75eb
commit ec4ef72c13
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/remote/remote_driver.c
View File

@ -540,6 +540,22 @@ remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED,
reason);
}
static bool
remoteConnectSupportsFeatureUnlocked(virConnectPtr conn,
struct private_data *priv,
int feature)
{
remote_connect_supports_feature_args args = { feature };
remote_connect_supports_feature_ret ret = { 0 };
int rc;
rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE,
(xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args,
(xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret);
return rc != -1 && ret.supported;
}
/* helper macro to ease extraction of arguments from the URI */
#define EXTRACT_URI_ARG_STR(ARG_NAME, ARG_VAR) \
if (STRCASEEQ(var->name, ARG_NAME)) { \
@ -1002,18 +1018,9 @@ doRemoteOpen(virConnectPtr conn,
goto failed;
if (virNetClientKeepAliveIsSupported(priv->client)) {
remote_connect_supports_feature_args args =
{ VIR_DRV_FEATURE_PROGRAM_KEEPALIVE };
remote_connect_supports_feature_ret ret = { 0 };
int rc;
rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE,
(xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args,
(xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret);
if (rc != -1 && ret.supported) {
priv->serverKeepAlive = true;
} else {
priv->serverKeepAlive = remoteConnectSupportsFeatureUnlocked(conn,
priv, VIR_DRV_FEATURE_PROGRAM_KEEPALIVE);
if (!priv->serverKeepAlive) {
VIR_INFO("Disabling keepalive protocol since it is not supported"
" by the server");
}
@ -1052,22 +1059,12 @@ doRemoteOpen(virConnectPtr conn,
/* Set up events */
if (!(priv->eventState = virObjectEventStateNew()))
goto failed;
{
remote_connect_supports_feature_args args =
{ VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK };
remote_connect_supports_feature_ret ret = { 0 };
int rc;
rc = call(conn, priv, 0, REMOTE_PROC_CONNECT_SUPPORTS_FEATURE,
(xdrproc_t)xdr_remote_connect_supports_feature_args, (char *) &args,
(xdrproc_t)xdr_remote_connect_supports_feature_ret, (char *) &ret);
if (rc != -1 && ret.supported) {
priv->serverEventFilter = true;
} else {
VIR_INFO("Avoiding server event filtering since it is not "
"supported by the server");
}
priv->serverEventFilter = remoteConnectSupportsFeatureUnlocked(conn,
priv, VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK);
if (!priv->serverEventFilter) {
VIR_INFO("Avoiding server event filtering since it is not "
"supported by the server");
}
/* Successful. */