Also include some whitespace changes. No functional change included. --- I pushed this one under the trivial rule. Matthias src/esx/esx_driver.c | 10 ++++++++++ src/esx/esx_vi.c | 25 ++++++++++++++----------- src/esx/esx_vi.h | 8 ++++---- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 55847bc..2241532 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2475,6 +2475,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, } + static int esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) { @@ -2482,6 +2483,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) } + static int esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) { @@ -2540,6 +2542,8 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) return priv->maxVcpus; } + + static int esxDomainGetMaxVcpus(virDomainPtr domain) { @@ -2547,6 +2551,8 @@ esxDomainGetMaxVcpus(virDomainPtr domain) VIR_DOMAIN_VCPU_MAXIMUM)); } + + static char * esxDomainDumpXML(virDomainPtr domain, int flags) { @@ -3809,12 +3815,16 @@ esxDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED) return 1; } + + static int esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) { return 0; } + + static virDomainSnapshotPtr esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc, unsigned int flags) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 76be5a4..5dbf744 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1812,7 +1812,7 @@ esxVI_GetVirtualMachineQuestionInfo int esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName, - esxVI_Boolean *value, esxVI_Occurrence occurence) + esxVI_Boolean *value, esxVI_Occurrence occurrence) { esxVI_DynamicProperty *dynamicProperty; @@ -1835,7 +1835,7 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName, } if (*value == esxVI_Boolean_Undefined && - occurence == esxVI_Occurrence_RequiredItem) { + occurrence == esxVI_Occurrence_RequiredItem) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Missing '%s' property"), propertyName); return -1; @@ -1844,9 +1844,11 @@ esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName, return 0; } + + int esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, - esxVI_Long **value, esxVI_Occurrence occurence) + esxVI_Long **value, esxVI_Occurrence occurrence) { esxVI_DynamicProperty *dynamicProperty; @@ -1866,7 +1868,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, } } - if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) { + if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Missing '%s' property"), propertyName); return -1; @@ -1880,7 +1882,7 @@ esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, int esxVI_GetStringValue(esxVI_ObjectContent *objectContent, const char *propertyName, - char **value, esxVI_Occurrence occurence) + char **value, esxVI_Occurrence occurrence) { esxVI_DynamicProperty *dynamicProperty; @@ -1902,7 +1904,7 @@ esxVI_GetStringValue(esxVI_ObjectContent *objectContent, } } - if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) { + if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Missing '%s' property"), propertyName); return -1; @@ -1917,7 +1919,7 @@ int esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent, const char *propertyName, esxVI_ManagedObjectReference **value, - esxVI_Occurrence occurence) + esxVI_Occurrence occurrence) { esxVI_DynamicProperty *dynamicProperty; @@ -1938,7 +1940,7 @@ esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent, } } - if (*value == NULL && occurence == esxVI_Occurrence_RequiredItem) { + if (*value == NULL && occurrence == esxVI_Occurrence_RequiredItem) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("Missing '%s' property"), propertyName); return -1; @@ -2265,9 +2267,10 @@ esxVI_GetSnapshotTreeBySnapshot -int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, - esxVI_String *propertyNameList, - esxVI_ObjectContent **hostSystem) +int +esxVI_LookupHostSystemProperties(esxVI_Context *ctx, + esxVI_String *propertyNameList, + esxVI_ObjectContent **hostSystem) { return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, "HostSystem", propertyNameList, diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index d512add..553967b 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -300,19 +300,19 @@ int esxVI_GetVirtualMachineQuestionInfo int esxVI_GetBoolean(esxVI_ObjectContent *objectContent, const char *propertyName, - esxVI_Boolean *value, esxVI_Occurrence occurence); + esxVI_Boolean *value, esxVI_Occurrence occurrence); int esxVI_GetLong(esxVI_ObjectContent *objectContent, const char *propertyName, - esxVI_Long **value, esxVI_Occurrence occurence); + esxVI_Long **value, esxVI_Occurrence occurrence); int esxVI_GetStringValue(esxVI_ObjectContent *objectContent, const char *propertyName, - char **value, esxVI_Occurrence occurence); + char **value, esxVI_Occurrence occurrence); int esxVI_GetManagedObjectReference(esxVI_ObjectContent *objectContent, const char *propertyName, esxVI_ManagedObjectReference **value, - esxVI_Occurrence occurence); + esxVI_Occurrence occurrence); int esxVI_LookupNumberOfDomainsByPowerState (esxVI_Context *ctx, esxVI_VirtualMachinePowerState powerState, -- 1.7.0.4