Added missing return(-1) to cpu APIs. #ifdef out methods not used by proxy

This commit is contained in:
Daniel P. Berrange 2006-09-04 19:15:10 +00:00
parent c63f08e06f
commit 903c78f540
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,9 @@
Mon Sep 4 14:13:24 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/xen_intern$al.h: Added missing return(-1) statements
in xenHypervisorGetVcpus and xenHypervisorPinVcpu methods.
#ifndef out the pause/resume/etc methods from proxy code
Sun Sep 3 12:50:12 EDT 2006 Daniel Berrange <berrange@redhat.com> Sun Sep 3 12:50:12 EDT 2006 Daniel Berrange <berrange@redhat.com>
* src/conf.c: Allow '_' in variable names, and don't fail if there * src/conf.c: Allow '_' in variable names, and don't fail if there

View File

@ -448,6 +448,7 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op)
return (0); return (0);
} }
#ifndef PROXY
/** /**
* xenHypervisorDoV2Dom: * xenHypervisorDoV2Dom:
* @handle: the handle to the Xen hypervisor * @handle: the handle to the Xen hypervisor
@ -489,6 +490,7 @@ xenHypervisorDoV2Dom(int handle, xen_op_v2_dom* op)
return (0); return (0);
} }
#endif /* PROXY */
/** /**
* virXen_getdomaininfolist: * virXen_getdomaininfolist:
@ -557,6 +559,7 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids,
return(ret); return(ret);
} }
#ifndef PROXY
/** /**
* virXen_pausedomain: * virXen_pausedomain:
* @handle: the hypervisor handle * @handle: the hypervisor handle
@ -821,6 +824,7 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu,
} }
return(ret); return(ret);
} }
#endif /* !PROXY*/
/** /**
* xenHypervisorInit: * xenHypervisorInit:
@ -1421,6 +1425,8 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu,
if ((domain == NULL) || (domain->conn == NULL) || if ((domain == NULL) || (domain->conn == NULL) ||
(domain->conn->handle < 0) || (cpumap == NULL) || (maplen < 1)) (domain->conn->handle < 0) || (cpumap == NULL) || (maplen < 1))
return (-1);
ret = virXen_setvcpumap(domain->conn->handle, domain->handle, vcpu, ret = virXen_setvcpumap(domain->conn->handle, domain->handle, vcpu,
cpumap, maplen); cpumap, maplen);
if (ret < 0) if (ret < 0)
@ -1502,4 +1508,5 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
} }
return nbinfo; return nbinfo;
#endif #endif
return -1;
} }