External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Xen: remove xendConfigVersion from driver private struct

Browse Source 
xendConfigVersion is no longer used, so remove it from the
xenUnifiedPrivate struct.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-12-14 19:53:16 -07:00
parent 60ac2aa821
commit be08842e47
3 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xen/xen_driver.c
View File

@ -487,7 +487,6 @@ xenUnifiedConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int f
conn->privateData = priv;
priv->handle = -1;
priv->xendConfigVersion = -1;
priv->xshandle = NULL;

2
src/xen/xen_driver.h
View File

@ -126,8 +126,6 @@ struct _xenUnifiedPrivate {
virDomainXMLOptionPtr xmlopt;
int handle; /* Xen hypervisor handle */
int xendConfigVersion; /* XenD config version */
/* connection to xend */
struct sockaddr_storage addr;
socklen_t addrlen;

37
src/xen/xend_internal.c
View File

@ -864,31 +864,6 @@ xenDaemonDomainLookupByName_ids(virConnectPtr xend,
}
static int
xend_detect_config_version(virConnectPtr conn)
{
struct sexpr *root;
const char *value;
xenUnifiedPrivatePtr priv = conn->privateData;
int ret = -1;
root = sexpr_get(conn, "/xend/node/");
if (root == NULL)
return ret;
value = sexpr_node(root, "node/xend_config_format");
if (value) {
if (virStrToLong_i(value, NULL, 10, &priv->xendConfigVersion) < 0)
goto cleanup;
}
ret = 0;
cleanup:
sexpr_free(root);
return ret;
}
/**
* sexpr_to_xend_domain_state:
* @root: an S-Expression describing a domain
@ -1186,22 +1161,19 @@ xenDaemonOpen(virConnectPtr conn,
virReportError(VIR_ERR_NO_CONNECT, __FUNCTION__);
goto failed;
}
if (xenDaemonOpen_unix(conn, conn->uri->path) < 0 ||
xend_detect_config_version(conn) == -1)
if (xenDaemonOpen_unix(conn, conn->uri->path) < 0)
goto failed;
} else if (STRCASEEQ(conn->uri->scheme, "xen")) {
/*
* try first to open the unix socket
*/
if (xenDaemonOpen_unix(conn, "/var/lib/xend/xend-socket") == 0 &&
xend_detect_config_version(conn) != -1)
if (xenDaemonOpen_unix(conn, "/var/lib/xend/xend-socket") == 0)
goto done;
/*
* try though http on port 8000
*/
if (xenDaemonOpen_tcp(conn, "localhost", "8000") < 0 ||
xend_detect_config_version(conn) == -1)
if (xenDaemonOpen_tcp(conn, "localhost", "8000") < 0)
goto failed;
} else if (STRCASEEQ(conn->uri->scheme, "http")) {
if (conn->uri->port &&
@ -1210,8 +1182,7 @@ xenDaemonOpen(virConnectPtr conn,
if (xenDaemonOpen_tcp(conn,
conn->uri->server ? conn->uri->server : "localhost",
port ? port : "8000") < 0 ||
xend_detect_config_version(conn) == -1)
port ? port : "8000") < 0)
goto failed;
} else {
virReportError(VIR_ERR_NO_CONNECT, __FUNCTION__);