External/libvirt
1
0
Fork 0
Code

remote: Clean up coding style and refactor remote connection opening

Browse Source 
Remove spaces before function calls and some other coding nits in some
parts of the remote driver and refactor getting of URI argument
components into variables used by libvirt later on.
This commit is contained in:
Peter Krempa 2012-07-17 14:25:34 +02:00
parent 16d3ab8662
commit 6758ad4f9e
1 changed files with 141 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

289
src/remote/remote_driver.c
View File

@ -346,6 +346,29 @@ static void remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED,
virMutexUnlock(&conn->lock); virMutexUnlock(&conn->lock);
} }
/* 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)) { \
VIR_FREE(ARG_VAR); \
if (!(ARG_VAR = strdup(var->value))) \
goto no_memory; \
var->ignore = 1; \
continue; \
}
#define EXTRACT_URI_ARG_BOOL(ARG_NAME, ARG_VAR) \
if (STRCASEEQ(var->name, ARG_NAME)) { \
int tmp; \
if (virStrToLong_i(var->value, NULL, 10, &tmp) < 0) { \
virReportError(VIR_ERR_INVALID_ARG, \
_("Failed to parse value of URI component %s"), \
var->name); \
goto failed; \
} \
ARG_VAR = tmp == 0; \
var->ignore = 1; \
continue; \
}
/* /*
* URIs that this driver needs to handle: * URIs that this driver needs to handle:
* *
@ -364,10 +387,10 @@ static void remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED,
* - xxx:/// -> UNIX domain socket * - xxx:/// -> UNIX domain socket
*/ */
static int static int
doRemoteOpen (virConnectPtr conn, doRemoteOpen(virConnectPtr conn,
struct private_data *priv, struct private_data *priv,
virConnectAuthPtr auth ATTRIBUTE_UNUSED, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
char *transport_str = NULL; char *transport_str = NULL;
enum { enum {
@ -381,7 +404,7 @@ doRemoteOpen (virConnectPtr conn,
const char *daemonPath; const char *daemonPath;
#endif #endif
/* We handle *ALL* URIs here. The caller has rejected any /* We handle *ALL* URIs here. The caller has rejected any
* URIs we don't care about */ * URIs we don't care about */
if (conn->uri) { if (conn->uri) {
@ -394,7 +417,7 @@ doRemoteOpen (virConnectPtr conn,
transport = trans_unix; transport = trans_unix;
} else { } else {
transport_str = get_transport_from_scheme (conn->uri->scheme); transport_str = get_transport_from_scheme(conn->uri->scheme);
if (!transport_str) { if (!transport_str) {
if (conn->uri->server) if (conn->uri->server)
@ -402,9 +425,9 @@ doRemoteOpen (virConnectPtr conn,
else else
transport = trans_unix; transport = trans_unix;
} else { } else {
if (STRCASEEQ (transport_str, "tls")) if (STRCASEEQ(transport_str, "tls"))
transport = trans_tls; transport = trans_tls;
else if (STRCASEEQ (transport_str, "unix")) { else if (STRCASEEQ(transport_str, "unix")) {
if (conn->uri->server) { if (conn->uri->server) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("using unix socket and remote " _("using unix socket and remote "
@ -414,11 +437,11 @@ doRemoteOpen (virConnectPtr conn,
} else { } else {
transport = trans_unix; transport = trans_unix;
} }
} else if (STRCASEEQ (transport_str, "ssh")) } else if (STRCASEEQ(transport_str, "ssh"))
transport = trans_ssh; transport = trans_ssh;
else if (STRCASEEQ (transport_str, "ext")) else if (STRCASEEQ(transport_str, "ext"))
transport = trans_ext; transport = trans_ext;
else if (STRCASEEQ (transport_str, "tcp")) else if (STRCASEEQ(transport_str, "tcp"))
transport = trans_tcp; transport = trans_tcp;
else { else {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
@ -446,26 +469,27 @@ doRemoteOpen (virConnectPtr conn,
/* Remote server defaults to "localhost" if not specified. */ /* Remote server defaults to "localhost" if not specified. */
if (conn->uri && conn->uri->port != 0) { if (conn->uri && conn->uri->port != 0) {
if (virAsprintf(&port, "%d", conn->uri->port) == -1) goto out_of_memory; if (virAsprintf(&port, "%d", conn->uri->port) < 0)
goto no_memory;
} else if (transport == trans_tls) { } else if (transport == trans_tls) {
port = strdup (LIBVIRTD_TLS_PORT); if (!(port = strdup(LIBVIRTD_TLS_PORT)))
if (!port) goto out_of_memory; goto no_memory;
} else if (transport == trans_tcp) { } else if (transport == trans_tcp) {
port = strdup (LIBVIRTD_TCP_PORT); if (!(port = strdup(LIBVIRTD_TCP_PORT)))
if (!port) goto out_of_memory; goto no_memory;
} else } /* Port not used for unix, ext., default for ssh */
port = NULL; /* Port not used for unix, ext., default for ssh */
if (conn->uri && conn->uri->server)
priv->hostname = strdup(conn->uri->server);
else
priv->hostname = strdup("localhost");
priv->hostname = strdup (conn->uri && conn->uri->server ?
conn->uri->server : "localhost");
if (!priv->hostname) if (!priv->hostname)
goto out_of_memory; goto no_memory;
if (conn->uri && conn->uri->user) {
username = strdup (conn->uri->user); if (conn->uri && conn->uri->user &&
if (!username) !(username = strdup (conn->uri->user)))
goto out_of_memory; goto no_memory;
}
/* Get the variables from the query string. /* Get the variables from the query string.
* Then we need to reconstruct the query string (because * Then we need to reconstruct the query string (because
@ -477,56 +501,26 @@ doRemoteOpen (virConnectPtr conn,
if (conn->uri) { if (conn->uri) {
for (i = 0; i < conn->uri->paramsCount ; i++) { for (i = 0; i < conn->uri->paramsCount ; i++) {
virURIParamPtr var = &conn->uri->params[i]; virURIParamPtr var = &conn->uri->params[i];
if (STRCASEEQ (var->name, "name")) { EXTRACT_URI_ARG_STR("name", name);
VIR_FREE(name); EXTRACT_URI_ARG_STR("command", command);
name = strdup (var->value); EXTRACT_URI_ARG_STR("socket", sockname);
if (!name) goto out_of_memory; EXTRACT_URI_ARG_STR("auth", authtype);
var->ignore = 1; EXTRACT_URI_ARG_STR("netcat", netcat);
} else if (STRCASEEQ (var->name, "command")) { EXTRACT_URI_ARG_STR("keyfile", keyfile);
VIR_FREE(command); EXTRACT_URI_ARG_STR("pkipath", pkipath);
command = strdup (var->value);
if (!command) goto out_of_memory; EXTRACT_URI_ARG_BOOL("no_sanity", sanity);
var->ignore = 1; EXTRACT_URI_ARG_BOOL("no_verify", verify);
} else if (STRCASEEQ (var->name, "socket")) { EXTRACT_URI_ARG_BOOL("no_tty", tty);
VIR_FREE(sockname);
sockname = strdup (var->value); if (STRCASEEQ(var->name, "authfile")) {
if (!sockname) goto out_of_memory;
var->ignore = 1;
} else if (STRCASEEQ (var->name, "auth")) {
VIR_FREE(authtype);
authtype = strdup (var->value);
if (!authtype) goto out_of_memory;
var->ignore = 1;
} else if (STRCASEEQ (var->name, "netcat")) {
VIR_FREE(netcat);
netcat = strdup (var->value);
if (!netcat) goto out_of_memory;
var->ignore = 1;
} else if (STRCASEEQ (var->name, "keyfile")) {
VIR_FREE(keyfile);
keyfile = strdup (var->value);
if (!keyfile) goto out_of_memory;
} else if (STRCASEEQ (var->name, "no_sanity")) {
sanity = atoi(var->value) == 0;
var->ignore = 1;
} else if (STRCASEEQ (var->name, "no_verify")) {
verify = atoi (var->value) == 0;
var->ignore = 1;
} else if (STRCASEEQ (var->name, "no_tty")) {
tty = atoi (var->value) == 0;
var->ignore = 1;
} else if (STRCASEEQ(var->name, "pkipath")) {
VIR_FREE(pkipath);
pkipath = strdup(var->value);
if (!pkipath) goto out_of_memory;
var->ignore = 1;
} else if (STRCASEEQ(var->name, "authfile")) {
/* Strip this param, used by virauth.c */ /* Strip this param, used by virauth.c */
var->ignore = 1; var->ignore = 1;
} else { continue;
VIR_DEBUG("passing through variable '%s' ('%s') to remote end",
var->name, var->value);
} }
VIR_DEBUG("passing through variable '%s' ('%s') to remote end",
var->name, var->value);
} }
/* Construct the original name. */ /* Construct the original name. */
@ -536,7 +530,7 @@ doRemoteOpen (virConnectPtr conn,
STRPREFIX(conn->uri->scheme, "remote+"))) { STRPREFIX(conn->uri->scheme, "remote+"))) {
/* Allow remote serve to probe */ /* Allow remote serve to probe */
if (!(name = strdup(""))) if (!(name = strdup("")))
goto out_of_memory; goto no_memory;
} else { } else {
virURI tmpuri = { virURI tmpuri = {
.scheme = conn->uri->scheme, .scheme = conn->uri->scheme,
@ -547,7 +541,7 @@ doRemoteOpen (virConnectPtr conn,
/* Evil, blank out transport scheme temporarily */ /* Evil, blank out transport scheme temporarily */
if (transport_str) { if (transport_str) {
assert (transport_str[-1] == '+'); assert(transport_str[-1] == '+');
transport_str[-1] = '\0'; transport_str[-1] = '\0';
} }
@ -566,7 +560,7 @@ doRemoteOpen (virConnectPtr conn,
} else { } else {
/* Probe URI server side */ /* Probe URI server side */
if (!(name = strdup(""))) if (!(name = strdup("")))
goto out_of_memory; goto no_memory;
} }
VIR_DEBUG("proceeding with name = %s", name); VIR_DEBUG("proceeding with name = %s", name);
@ -578,7 +572,6 @@ doRemoteOpen (virConnectPtr conn,
goto failed; goto failed;
} }
VIR_DEBUG("Connecting with transport %d", transport); VIR_DEBUG("Connecting with transport %d", transport);
/* Connect to the remote service. */ /* Connect to the remote service. */
switch (transport) { switch (transport) {
@ -615,7 +608,7 @@ doRemoteOpen (virConnectPtr conn,
if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) {
VIR_FREE(userdir); VIR_FREE(userdir);
goto out_of_memory; goto no_memory;
} }
VIR_FREE(userdir); VIR_FREE(userdir);
} else { } else {
@ -624,7 +617,7 @@ doRemoteOpen (virConnectPtr conn,
else else
sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET); sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET);
if (sockname == NULL) if (sockname == NULL)
goto out_of_memory; goto no_memory;
} }
VIR_DEBUG("Proceeding with sockname %s", sockname); VIR_DEBUG("Proceeding with sockname %s", sockname);
} }
@ -643,17 +636,16 @@ doRemoteOpen (virConnectPtr conn,
break; break;
case trans_ssh: case trans_ssh:
command = command ? command : strdup ("ssh"); if (!command && !(command = strdup("ssh")))
if (command == NULL) goto no_memory;
goto out_of_memory;
if (!sockname) { if (!sockname) {
if (flags & VIR_DRV_OPEN_REMOTE_RO) if (flags & VIR_DRV_OPEN_REMOTE_RO)
sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET_RO); sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET_RO);
else else
sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET); sockname = strdup(LIBVIRTD_PRIV_UNIX_SOCKET);
if (sockname == NULL) if (!sockname)
goto out_of_memory; goto no_memory;
} }
if (!(priv->client = virNetClientNewSSH(priv->hostname, if (!(priv->client = virNetClientNewSSH(priv->hostname,
@ -743,9 +735,9 @@ doRemoteOpen (virConnectPtr conn,
remote_open_args args = { &name, flags }; remote_open_args args = { &name, flags };
VIR_DEBUG("Trying to open URI %s", name); VIR_DEBUG("Trying to open URI %s", name);
if (call (conn, priv, 0, REMOTE_PROC_OPEN, if (call(conn, priv, 0, REMOTE_PROC_OPEN,
(xdrproc_t) xdr_remote_open_args, (char *) &args, (xdrproc_t) xdr_remote_open_args, (char *) &args,
(xdrproc_t) xdr_void, (char *) NULL) == -1) (xdrproc_t) xdr_void, (char *) NULL) == -1)
goto failed; goto failed;
} }
@ -754,11 +746,11 @@ doRemoteOpen (virConnectPtr conn,
remote_get_uri_ret uriret; remote_get_uri_ret uriret;
VIR_DEBUG("Trying to query remote URI"); VIR_DEBUG("Trying to query remote URI");
memset (&uriret, 0, sizeof(uriret)); memset(&uriret, 0, sizeof(uriret));
if (call (conn, priv, 0, if (call(conn, priv, 0,
REMOTE_PROC_GET_URI, REMOTE_PROC_GET_URI,
(xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL,
(xdrproc_t) xdr_remote_get_uri_ret, (char *) &uriret) < 0) (xdrproc_t) xdr_remote_get_uri_ret, (char *) &uriret) < 0)
goto failed; goto failed;
VIR_DEBUG("Auto-probed URI is %s", uriret.uri); VIR_DEBUG("Auto-probed URI is %s", uriret.uri);
@ -788,7 +780,7 @@ doRemoteOpen (virConnectPtr conn,
return retcode; return retcode;
out_of_memory: no_memory:
virReportOOMError(); virReportOOMError();
failed: failed:
@ -801,6 +793,8 @@ doRemoteOpen (virConnectPtr conn,
VIR_FREE(priv->hostname); VIR_FREE(priv->hostname);
goto cleanup; goto cleanup;
} }
#undef EXTRACT_URI_ARG_STR
#undef EXTRACT_URI_ARG_BOOL
static struct private_data * static struct private_data *
remoteAllocPrivateData(void) remoteAllocPrivateData(void)
@ -924,23 +918,23 @@ remoteOpen (virConnectPtr conn,
/* In a string "driver+transport" return a pointer to "transport". */ /* In a string "driver+transport" return a pointer to "transport". */
static char * static char *
get_transport_from_scheme (char *scheme) get_transport_from_scheme(char *scheme)
{ {
char *p = strchr (scheme, '+'); char *p = strchr(scheme, '+');
return p ? p+1 : 0; return p ? p + 1 : NULL;
} }
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/
static int static int
doRemoteClose (virConnectPtr conn, struct private_data *priv) doRemoteClose(virConnectPtr conn, struct private_data *priv)
{ {
int ret = 0; int ret = 0;
if (call (conn, priv, 0, REMOTE_PROC_CLOSE, if (call(conn, priv, 0, REMOTE_PROC_CLOSE,
(xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL,
(xdrproc_t) xdr_void, (char *) NULL) == -1) (xdrproc_t) xdr_void, (char *) NULL) == -1)
ret = -1; ret = -1;
virObjectUnref(priv->tls); virObjectUnref(priv->tls);
@ -965,7 +959,7 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv)
} }
static int static int
remoteClose (virConnectPtr conn) remoteClose(virConnectPtr conn)
{ {
int ret = 0; int ret = 0;
struct private_data *priv = conn->privateData; struct private_data *priv = conn->privateData;
@ -995,7 +989,7 @@ remoteClose (virConnectPtr conn)
* http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html * http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html
*/ */
static const char * static const char *
remoteType (virConnectPtr conn) remoteType(virConnectPtr conn)
{ {
char *rv = NULL; char *rv = NULL;
remote_get_type_ret ret; remote_get_type_ret ret;
@ -1009,10 +1003,10 @@ remoteType (virConnectPtr conn)
goto done; goto done;
} }
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_GET_TYPE, if (call(conn, priv, 0, REMOTE_PROC_GET_TYPE,
(xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL,
(xdrproc_t) xdr_remote_get_type_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_get_type_ret, (char *) &ret) == -1)
goto done; goto done;
/* Stash. */ /* Stash. */
@ -1030,10 +1024,10 @@ static int remoteIsSecure(virConnectPtr conn)
remote_is_secure_ret ret; remote_is_secure_ret ret;
remoteDriverLock(priv); remoteDriverLock(priv);
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_IS_SECURE, if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE,
(xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL,
(xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1)
goto done; goto done;
/* We claim to be secure, if the remote driver /* We claim to be secure, if the remote driver
@ -1059,10 +1053,10 @@ static int remoteIsEncrypted(virConnectPtr conn)
remote_is_secure_ret ret; remote_is_secure_ret ret;
remoteDriverLock(priv); remoteDriverLock(priv);
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_IS_SECURE, if (call(conn, priv, 0, REMOTE_PROC_IS_SECURE,
(xdrproc_t) xdr_void, (char *) NULL, (xdrproc_t) xdr_void, (char *) NULL,
(xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_is_secure_ret, (char *) &ret) == -1)
goto done; goto done;
if (virNetClientIsEncrypted(priv->client)) if (virNetClientIsEncrypted(priv->client))
@ -1084,10 +1078,10 @@ done:
} }
static int static int
remoteNodeGetCPUStats (virConnectPtr conn, remoteNodeGetCPUStats(virConnectPtr conn,
int cpuNum, int cpuNum,
virNodeCPUStatsPtr params, int *nparams, virNodeCPUStatsPtr params, int *nparams,
unsigned int flags) unsigned int flags)
{ {
int rv = -1; int rv = -1;
remote_node_get_cpu_stats_args args; remote_node_get_cpu_stats_args args;
@ -1101,12 +1095,12 @@ remoteNodeGetCPUStats (virConnectPtr conn,
args.cpuNum = cpuNum; args.cpuNum = cpuNum;
args.flags = flags; args.flags = flags;
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_CPU_STATS, if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CPU_STATS,
(xdrproc_t) xdr_remote_node_get_cpu_stats_args, (xdrproc_t) xdr_remote_node_get_cpu_stats_args,
(char *) &args, (char *) &args,
(xdrproc_t) xdr_remote_node_get_cpu_stats_ret, (xdrproc_t) xdr_remote_node_get_cpu_stats_ret,
(char *) &ret) == -1) (char *) &ret) == -1)
goto done; goto done;
/* Check the length of the returned list carefully. */ /* Check the length of the returned list carefully. */
@ -1142,18 +1136,18 @@ remoteNodeGetCPUStats (virConnectPtr conn,
rv = 0; rv = 0;
cleanup: cleanup:
xdr_free ((xdrproc_t) xdr_remote_node_get_cpu_stats_ret, xdr_free((xdrproc_t) xdr_remote_node_get_cpu_stats_ret, (char *) &ret);
(char *) &ret);
done: done:
remoteDriverUnlock(priv); remoteDriverUnlock(priv);
return rv; return rv;
} }
static int static int
remoteNodeGetMemoryStats (virConnectPtr conn, remoteNodeGetMemoryStats(virConnectPtr conn,
int cellNum, int cellNum,
virNodeMemoryStatsPtr params, int *nparams, virNodeMemoryStatsPtr params,
unsigned int flags) int *nparams,
unsigned int flags)
{ {
int rv = -1; int rv = -1;
remote_node_get_memory_stats_args args; remote_node_get_memory_stats_args args;
@ -1168,9 +1162,9 @@ remoteNodeGetMemoryStats (virConnectPtr conn,
args.flags = flags; args.flags = flags;
memset (&ret, 0, sizeof(ret)); memset (&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_STATS, if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_STATS,
(xdrproc_t) xdr_remote_node_get_memory_stats_args, (char *) &args, (xdrproc_t) xdr_remote_node_get_memory_stats_args, (char *) &args,
(xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret) == -1)
goto done; goto done;
/* Check the length of the returned list carefully. */ /* Check the length of the returned list carefully. */
@ -1206,8 +1200,7 @@ remoteNodeGetMemoryStats (virConnectPtr conn,
rv = 0; rv = 0;
cleanup: cleanup:
xdr_free ((xdrproc_t) xdr_remote_node_get_memory_stats_ret, xdr_free((xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret);
(char *) &ret);
done: done:
remoteDriverUnlock(priv); remoteDriverUnlock(priv);
return rv; return rv;
@ -1215,9 +1208,9 @@ done:
static int static int
remoteNodeGetCellsFreeMemory(virConnectPtr conn, remoteNodeGetCellsFreeMemory(virConnectPtr conn,
unsigned long long *freeMems, unsigned long long *freeMems,
int startCell, int startCell,
int maxCells) int maxCells)
{ {
int rv = -1; int rv = -1;
remote_node_get_cells_free_memory_args args; remote_node_get_cells_free_memory_args args;
@ -1237,10 +1230,10 @@ remoteNodeGetCellsFreeMemory(virConnectPtr conn,
args.startCell = startCell; args.startCell = startCell;
args.maxcells = maxCells; args.maxcells = maxCells;
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY, if (call(conn, priv, 0, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY,
(xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *)&args, (xdrproc_t) xdr_remote_node_get_cells_free_memory_args, (char *)&args,
(xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1) (xdrproc_t) xdr_remote_node_get_cells_free_memory_ret, (char *)&ret) == -1)
goto done; goto done;
for (i = 0 ; i < ret.cells.cells_len ; i++) for (i = 0 ; i < ret.cells.cells_len ; i++)
@ -1256,7 +1249,7 @@ done:
} }
static int static int
remoteListDomains (virConnectPtr conn, int *ids, int maxids) remoteListDomains(virConnectPtr conn, int *ids, int maxids)
{ {
int rv = -1; int rv = -1;
int i; int i;
@ -1274,10 +1267,10 @@ remoteListDomains (virConnectPtr conn, int *ids, int maxids)
} }
args.maxids = maxids; args.maxids = maxids;
memset (&ret, 0, sizeof(ret)); memset(&ret, 0, sizeof(ret));
if (call (conn, priv, 0, REMOTE_PROC_LIST_DOMAINS, if (call(conn, priv, 0, REMOTE_PROC_LIST_DOMAINS,
(xdrproc_t) xdr_remote_list_domains_args, (char *) &args, (xdrproc_t) xdr_remote_list_domains_args, (char *) &args,
(xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret) == -1)
goto done; goto done;
if (ret.ids.ids_len > maxids) { if (ret.ids.ids_len > maxids) {
@ -1293,7 +1286,7 @@ remoteListDomains (virConnectPtr conn, int *ids, int maxids)
rv = ret.ids.ids_len; rv = ret.ids.ids_len;
cleanup: cleanup:
xdr_free ((xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret); xdr_free((xdrproc_t) xdr_remote_list_domains_ret, (char *) &ret);
done: done:
remoteDriverUnlock(priv); remoteDriverUnlock(priv);