NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove xen driver checks for priv->handle < 0

Browse Source 
The Xen hypervisor driver checks for 'priv->handle < 0' and
returns -1, but without raising any error. Fortunately this
code will never be executed, since the main Xen driver always
checks 'priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET]' prior
to invoking any hypervisor API. Just remove the redundant
checks for priv->handle

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-30 13:16:06 +01:00
parent ab2a3d01e5
commit a855556f88
1 changed files with 16 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/xen/xen_hypervisor.c
View File

@ -1165,11 +1165,6 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams)
char *schedulertype = NULL; char *schedulertype = NULL;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("priv->handle invalid"));
return NULL;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running")); "%s", _("domain is not running"));
@ -1240,11 +1235,7 @@ xenHypervisorGetSchedulerParameters(virDomainPtr domain,
{ {
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("priv->handle invalid"));
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running")); "%s", _("domain is not running"));
@ -1353,11 +1344,6 @@ xenHypervisorSetSchedulerParameters(virDomainPtr domain,
NULL) < 0) NULL) < 0)
return -1; return -1;
if (priv->handle < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("priv->handle invalid"));
return -1;
}
if (domain->id < 0) { if (domain->id < 0) {
virReportError(VIR_ERR_OPERATION_INVALID, virReportError(VIR_ERR_OPERATION_INVALID,
"%s", _("domain is not running")); "%s", _("domain is not running"));
@ -2209,7 +2195,7 @@ xenHypervisorOpen(virConnectPtr conn,
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
if (xenHypervisorInitialize() < 0) if (xenHypervisorInitialize() < 0)
return -1; return VIR_DRV_OPEN_ERROR;
priv->handle = -1; priv->handle = -1;
@ -2221,7 +2207,7 @@ xenHypervisorOpen(virConnectPtr conn,
priv->handle = ret; priv->handle = ret;
return 0; return VIR_DRV_OPEN_SUCCESS;
} }
/** /**
@ -2238,9 +2224,6 @@ xenHypervisorClose(virConnectPtr conn)
int ret; int ret;
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->handle < 0)
return -1;
ret = VIR_CLOSE(priv->handle); ret = VIR_CLOSE(priv->handle);
if (ret < 0) if (ret < 0)
return -1; return -1;
@ -2259,12 +2242,8 @@ xenHypervisorClose(virConnectPtr conn)
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
xenHypervisorGetVersion(virConnectPtr conn, unsigned long *hvVer) xenHypervisorGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer)
{ {
xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->handle < 0)
return -1;
*hvVer = (hv_versions.hv >> 16) * 1000000 + (hv_versions.hv & 0xFFFF) * 1000; *hvVer = (hv_versions.hv >> 16) * 1000000 + (hv_versions.hv & 0xFFFF) * 1000;
return 0; return 0;
} }
@ -2769,9 +2748,6 @@ xenHypervisorNumOfDomains(virConnectPtr conn)
int maxids = last_maxids; int maxids = last_maxids;
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->handle < 0)
return -1;
retry: retry:
if (!(XEN_GETDOMAININFOLIST_ALLOC(dominfos, maxids))) { if (!(XEN_GETDOMAININFOLIST_ALLOC(dominfos, maxids))) {
virReportOOMError(); virReportOOMError();
@ -2823,9 +2799,6 @@ xenHypervisorListDomains(virConnectPtr conn, int *ids, int maxids)
int ret, nbids, i; int ret, nbids, i;
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->handle < 0)
return -1;
if (maxids == 0) if (maxids == 0)
return 0; return 0;
@ -2866,12 +2839,6 @@ xenHypervisorDomainGetOSType(virDomainPtr dom)
xen_getdomaininfo dominfo; xen_getdomaininfo dominfo;
char *ostype = NULL; char *ostype = NULL;
if (priv->handle < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("domain shut off or invalid"));
return NULL;
}
/* HV's earlier than 3.1.0 don't include the HVM flags in guests status*/ /* HV's earlier than 3.1.0 don't include the HVM flags in guests status*/
if (hv_versions.hypervisor < 2 || if (hv_versions.hypervisor < 2 ||
hv_versions.dom_interface < 4) { hv_versions.dom_interface < 4) {
@ -2911,9 +2878,6 @@ xenHypervisorHasDomain(virConnectPtr conn, int id)
xenUnifiedPrivatePtr priv = conn->privateData; xenUnifiedPrivatePtr priv = conn->privateData;
xen_getdomaininfo dominfo; xen_getdomaininfo dominfo;
if (priv->handle < 0)
return 0;
XEN_GETDOMAININFO_CLEAR(dominfo); XEN_GETDOMAININFO_CLEAR(dominfo);
if (virXen_getdomaininfo(priv->handle, id, &dominfo) < 0) if (virXen_getdomaininfo(priv->handle, id, &dominfo) < 0)
@ -2933,9 +2897,6 @@ xenHypervisorLookupDomainByID(virConnectPtr conn, int id)
virDomainPtr ret; virDomainPtr ret;
char *name; char *name;
if (priv->handle < 0)
return NULL;
XEN_GETDOMAININFO_CLEAR(dominfo); XEN_GETDOMAININFO_CLEAR(dominfo);
if (virXen_getdomaininfo(priv->handle, id, &dominfo) < 0) if (virXen_getdomaininfo(priv->handle, id, &dominfo) < 0)
@ -2967,9 +2928,6 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid)
char *name; char *name;
int maxids = 100, nids, i, id; int maxids = 100, nids, i, id;
if (priv->handle < 0)
return NULL;
retry: retry:
if (!(XEN_GETDOMAININFOLIST_ALLOC(dominfos, maxids))) { if (!(XEN_GETDOMAININFOLIST_ALLOC(dominfos, maxids))) {
virReportOOMError(); virReportOOMError();
@ -3030,13 +2988,9 @@ xenHypervisorLookupDomainByUUID(virConnectPtr conn, const unsigned char *uuid)
* Returns the maximum of CPU defined by Xen. * Returns the maximum of CPU defined by Xen.
*/ */
int int
xenHypervisorGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) xenHypervisorGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED,
const char *type ATTRIBUTE_UNUSED)
{ {
xenUnifiedPrivatePtr priv = conn->privateData;
if (priv->handle < 0)
return -1;
return MAX_VIRT_CPUS; return MAX_VIRT_CPUS;
} }
@ -3057,9 +3011,6 @@ xenHypervisorGetDomMaxMemory(virConnectPtr conn, int id)
xen_getdomaininfo dominfo; xen_getdomaininfo dominfo;
int ret; int ret;
if (priv->handle < 0)
return 0;
if (kb_per_pages == 0) { if (kb_per_pages == 0) {
kb_per_pages = sysconf(_SC_PAGESIZE) / 1024; kb_per_pages = sysconf(_SC_PAGESIZE) / 1024;
if (kb_per_pages <= 0) if (kb_per_pages <= 0)
@ -3089,9 +3040,7 @@ xenHypervisorGetDomMaxMemory(virConnectPtr conn, int id)
static unsigned long long ATTRIBUTE_NONNULL(1) static unsigned long long ATTRIBUTE_NONNULL(1)
xenHypervisorGetMaxMemory(virDomainPtr domain) xenHypervisorGetMaxMemory(virDomainPtr domain)
{ {
xenUnifiedPrivatePtr priv = domain->conn->privateData; if (domain->id < 0)
if (priv->handle < 0 || domain->id < 0)
return 0; return 0;
return xenHypervisorGetDomMaxMemory(domain->conn, domain->id); return xenHypervisorGetDomMaxMemory(domain->conn, domain->id);
@ -3121,9 +3070,6 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info)
kb_per_pages = 4; kb_per_pages = 4;
} }
if (priv->handle < 0)
return -1;
memset(info, 0, sizeof(virDomainInfo)); memset(info, 0, sizeof(virDomainInfo));
XEN_GETDOMAININFO_CLEAR(dominfo); XEN_GETDOMAININFO_CLEAR(dominfo);
@ -3189,9 +3135,7 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info)
int int
xenHypervisorGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info) xenHypervisorGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info)
{ {
xenUnifiedPrivatePtr priv = domain->conn->privateData; if (domain->id < 0)
if (priv->handle < 0 || domain->id < 0)
return -1; return -1;
return xenHypervisorGetDomInfo(domain->conn, domain->id, info); return xenHypervisorGetDomInfo(domain->conn, domain->id, info);
@ -3215,12 +3159,11 @@ xenHypervisorGetDomainState(virDomainPtr domain,
int *reason, int *reason,
unsigned int flags) unsigned int flags)
{ {
xenUnifiedPrivatePtr priv = domain->conn->privateData;
virDomainInfo info; virDomainInfo info;
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
if (xenHypervisorGetDomInfo(domain->conn, domain->id, &info) < 0) if (xenHypervisorGetDomInfo(domain->conn, domain->id, &info) < 0)
@ -3281,12 +3224,6 @@ xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn,
return -1; return -1;
} }
if (priv->handle < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("priv->handle invalid"));
return -1;
}
memset(&op_sys, 0, sizeof(op_sys)); memset(&op_sys, 0, sizeof(op_sys));
op_sys.cmd = XEN_V2_OP_GETAVAILHEAP; op_sys.cmd = XEN_V2_OP_GETAVAILHEAP;
@ -3322,7 +3259,7 @@ xenHypervisorPauseDomain(virDomainPtr domain)
int ret; int ret;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
ret = virXen_pausedomain(priv->handle, domain->id); ret = virXen_pausedomain(priv->handle, domain->id);
@ -3345,7 +3282,7 @@ xenHypervisorResumeDomain(virDomainPtr domain)
int ret; int ret;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
ret = virXen_unpausedomain(priv->handle, domain->id); ret = virXen_unpausedomain(priv->handle, domain->id);
@ -3374,7 +3311,7 @@ xenHypervisorDestroyDomainFlags(virDomainPtr domain, unsigned int flags)
virCheckFlags(0, -1); virCheckFlags(0, -1);
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
ret = virXen_destroydomain(priv->handle, domain->id); ret = virXen_destroydomain(priv->handle, domain->id);
@ -3398,7 +3335,7 @@ xenHypervisorSetMaxMemory(virDomainPtr domain, unsigned long memory)
int ret; int ret;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
ret = virXen_setmaxmem(priv->handle, domain->id, memory); ret = virXen_setmaxmem(priv->handle, domain->id, memory);
@ -3424,7 +3361,7 @@ xenHypervisorSetVcpus(virDomainPtr domain, unsigned int nvcpus)
int ret; int ret;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0 || domain->id < 0 || nvcpus < 1) if (domain->id < 0 || nvcpus < 1)
return -1; return -1;
ret = virXen_setmaxvcpus(priv->handle, domain->id, nvcpus); ret = virXen_setmaxvcpus(priv->handle, domain->id, nvcpus);
@ -3452,7 +3389,7 @@ xenHypervisorPinVcpu(virDomainPtr domain, unsigned int vcpu,
int ret; int ret;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0 || domain->id < 0) if (domain->id < 0)
return -1; return -1;
ret = virXen_setvcpumap(priv->handle, domain->id, vcpu, ret = virXen_setvcpumap(priv->handle, domain->id, vcpu,
@ -3494,7 +3431,7 @@ xenHypervisorGetVcpus(virDomainPtr domain,
virVcpuInfoPtr ipt; virVcpuInfoPtr ipt;
int nbinfo, i; int nbinfo, i;
if (priv->handle < 0 || domain->id < 0 || sizeof(cpumap_t) & 7) { if (domain->id < 0 || sizeof(cpumap_t) & 7) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("domain shut off or invalid")); _("domain shut off or invalid"));
return -1; return -1;
@ -3556,9 +3493,6 @@ xenHypervisorGetVcpuMax(virDomainPtr domain)
int maxcpu; int maxcpu;
xenUnifiedPrivatePtr priv = domain->conn->privateData; xenUnifiedPrivatePtr priv = domain->conn->privateData;
if (priv->handle < 0)
return -1;
/* inactive domain */ /* inactive domain */
if (domain->id < 0) { if (domain->id < 0) {
maxcpu = MAX_VIRT_CPUS; maxcpu = MAX_VIRT_CPUS;