External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thu Jun 21 16:48:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

Browse Source 
* src/remote_internal.c: Fix virConnectGetMaxVcpus in the
	  remote case when type parameter is NULL.
	* src/xend_internal.c: Proper error reporting in
	  xenDaemonDomainDumpXML function.
This commit is contained in:
Richard W.M. Jones 2007-06-21 15:49:09 +00:00
parent 67ec3c93bc
commit 10960f2a1a
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Jun 21 16:48:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
* src/remote_internal.c: Fix virConnectGetMaxVcpus in the
remote case when type parameter is NULL.
* src/xend_internal.c: Proper error reporting in
xenDaemonDomainDumpXML function.
Thu Jun 21 11:35:00 EST 2007 Daniel P. Berrange <berrange@redhat.com> Thu Jun 21 11:35:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
* src/remote_interal.c: fix marshalling of 'id' field for * src/remote_interal.c: fix marshalling of 'id' field for

2
src/remote_internal.c
View File

@ -985,7 +985,7 @@ remoteGetMaxVcpus (virConnectPtr conn, const char *type)
GET_PRIVATE (conn, -1); GET_PRIVATE (conn, -1);
memset (&ret, 0, sizeof ret); memset (&ret, 0, sizeof ret);
args.type = (char **) &type; args.type = type == NULL ? NULL : (char **) &type;
if (call (conn, priv, 0, REMOTE_PROC_GET_MAX_VCPUS, if (call (conn, priv, 0, REMOTE_PROC_GET_MAX_VCPUS,
(xdrproc_t) xdr_remote_get_max_vcpus_args, (char *) &args, (xdrproc_t) xdr_remote_get_max_vcpus_args, (char *) &args,
(xdrproc_t) xdr_remote_get_max_vcpus_ret, (char *) &ret) == -1) (xdrproc_t) xdr_remote_get_max_vcpus_ret, (char *) &ret) == -1)

16
src/xend_internal.c
View File

@ -2398,8 +2398,11 @@ xenDaemonDomainDumpXMLByID(virConnectPtr conn, int domid)
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
root = sexpr_get(conn, "/xend/domain/%d?detail=1", domid); root = sexpr_get(conn, "/xend/domain/%d?detail=1", domid);
if (root == NULL) if (root == NULL) {
virXendError (conn, VIR_ERR_XEN_CALL,
"xenDaemonDomainDumpXMLByID failed to find this domain");
return (NULL); return (NULL);
}
priv = (xenUnifiedPrivatePtr) conn->privateData; priv = (xenUnifiedPrivatePtr) conn->privateData;
@ -2417,8 +2420,11 @@ xenDaemonDomainDumpXMLByName(virConnectPtr conn, const char *name)
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
root = sexpr_get(conn, "/xend/domain/%s?detail=1", name); root = sexpr_get(conn, "/xend/domain/%s?detail=1", name);
if (root == NULL) if (root == NULL) {
virXendError (conn, VIR_ERR_XEN_CALL,
"xenDaemonDomainDumpXMLByName failed to find this domain");
return (NULL); return (NULL);
}
priv = (xenUnifiedPrivatePtr) conn->privateData; priv = (xenUnifiedPrivatePtr) conn->privateData;
@ -2451,8 +2457,12 @@ xenDaemonDomainDumpXML(virDomainPtr domain, int flags ATTRIBUTE_UNUSED)
} }
priv = (xenUnifiedPrivatePtr) domain->conn->privateData; priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
if (domain->id < 0 && priv->xendConfigVersion < 3) if (domain->id < 0 && priv->xendConfigVersion < 3) {
virXendError (domain->conn, VIR_ERR_XEN_CALL,
"xenDaemonDomainDumpXML domain ID < 0 and xendConfigVersion < 3");
return(NULL); return(NULL);
}
if (domain->id < 0) if (domain->id < 0)
return xenDaemonDomainDumpXMLByName(domain->conn, domain->name); return xenDaemonDomainDumpXMLByName(domain->conn, domain->name);
else else