On Sun, Dec 13, 2009 at 12:20:45AM +0100, Matthias Bolte wrote:
> ---
> src/esx/esx_driver.c | 20 ++++++++++----------
> src/esx/esx_vi.c | 14 +++++++-------
> src/esx/esx_vi.h | 16 ++++++++--------
> src/esx/esx_vi_methods.c | 2 +-
> src/esx/esx_vmx.c | 2 +-
> 5 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
> index d7e1ab5..ca8b4d3 100644
> --- a/src/esx/esx_driver.c
> +++ b/src/esx/esx_driver.c
> @@ -1158,7 +1158,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
> "runtime.powerState\0") < 0 ||
> esxVI_LookupVirtualMachineByUuid(conn, priv->host, uuid,
> propertyNameList, &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachineIdentity(conn, virtualMachine,
> &id, &name, NULL) < 0 ||
> esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
> @@ -1415,7 +1415,7 @@ esxDomainShutdown(virDomainPtr domain)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
> &powerState) < 0) {
> goto failure;
> @@ -1464,7 +1464,7 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
> &powerState) < 0) {
> goto failure;
> @@ -1587,7 +1587,7 @@ esxDomainGetMaxMemory(virDomainPtr domain)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0) {
> + esxVI_Occurrence_RequiredItem) < 0) {
> goto failure;
> }
>
> @@ -1771,7 +1771,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0) {
> + esxVI_Occurrence_RequiredItem) < 0) {
> goto failure;
> }
>
> @@ -2159,7 +2159,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0) {
> + esxVI_Occurrence_RequiredItem) < 0) {
> goto failure;
> }
>
> @@ -2497,7 +2497,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED)
> /* Check if an existing domain should be edited */
> if (esxVI_LookupVirtualMachineByUuid(conn, priv->host, def->uuid, NULL,
> &virtualMachine,
> - esxVI_Occurence_OptionalItem) < 0) {
> + esxVI_Occurrence_OptionalItem) < 0) {
> goto failure;
> }
>
> @@ -2686,7 +2686,7 @@ esxDomainUndefine(virDomainPtr domain)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
> &powerState) < 0) {
> goto failure;
> @@ -2794,7 +2794,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0) {
> + esxVI_Occurrence_RequiredItem) < 0) {
> goto failure;
> }
>
> @@ -3332,7 +3332,7 @@ esxDomainIsActive(virDomainPtr domain)
> esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
> domain->uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
> &powerState) < 0) {
> goto failure;
> diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
> index cbc4613..e039a5d 100644
> --- a/src/esx/esx_vi.c
> +++ b/src/esx/esx_vi.c
> @@ -1803,7 +1803,7 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
> const unsigned char *uuid,
> esxVI_String *propertyNameList,
> esxVI_ObjectContent **virtualMachine,
> - esxVI_Occurence occurence)
> + esxVI_Occurrence occurrence)
> {
> int result = 0;
> esxVI_ManagedObjectReference *managedObjectReference = NULL;
> @@ -1820,7 +1820,7 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
> }
>
> if (managedObjectReference == NULL) {
> - if (occurence == esxVI_Occurence_OptionalItem) {
> + if (occurrence == esxVI_Occurrence_OptionalItem) {
> return 0;
> } else {
> virUUIDFormat(uuid, uuid_string);
> @@ -1870,7 +1870,7 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask
> esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid,
> completePropertyNameList,
> virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachineQuestionInfo(conn, *virtualMachine,
> &questionInfo) < 0 ||
> esxVI_LookupPendingTaskInfoListByVirtualMachine
> @@ -1909,7 +1909,7 @@ int
> esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
> const char *name, esxVI_String *propertyNameList,
> esxVI_ObjectContent **datastore,
> - esxVI_Occurence occurence)
> + esxVI_Occurrence occurrence)
> {
> int result = 0;
> esxVI_String *completePropertyNameList = NULL;
> @@ -1943,7 +1943,7 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
> }
>
> if (datastoreList == NULL) {
> - if (occurence == esxVI_Occurence_OptionalItem) {
> + if (occurrence == esxVI_Occurrence_OptionalItem) {
> goto cleanup;
> } else {
> ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
> @@ -2038,7 +2038,7 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
> }
> }
>
> - if (occurence != esxVI_Occurence_OptionalItem) {
> + if (occurrence != esxVI_Occurrence_OptionalItem) {
> if (numInaccessibleDatastores > 0) {
> ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
> "Could not find datastore '%s', maybe it's "
> @@ -2196,7 +2196,7 @@ esxVI_LookupAndHandleVirtualMachineQuestion(virConnectPtr conn,
> "runtime.question") < 0 ||
> esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid, propertyNameList,
> &virtualMachine,
> - esxVI_Occurence_RequiredItem) < 0 ||
> + esxVI_Occurrence_RequiredItem) < 0 ||
> esxVI_GetVirtualMachineQuestionInfo(conn, virtualMachine,
> &questionInfo) < 0) {
> goto failure;
> diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
> index a10d874..c2054c8 100644
> --- a/src/esx/esx_vi.h
> +++ b/src/esx/esx_vi.h
> @@ -33,7 +33,7 @@
>
> typedef enum _esxVI_APIVersion esxVI_APIVersion;
> typedef enum _esxVI_ProductVersion esxVI_ProductVersion;
> -typedef enum _esxVI_Occurence esxVI_Occurence;
> +typedef enum _esxVI_Occurrence esxVI_Occurrence;
> typedef struct _esxVI_Context esxVI_Context;
> typedef struct _esxVI_Response esxVI_Response;
> typedef struct _esxVI_Enumeration esxVI_Enumeration;
> @@ -58,11 +58,11 @@ enum _esxVI_ProductVersion {
> esxVI_ProductVersion_VPX40
> };
>
> -enum _esxVI_Occurence {
> - esxVI_Occurence_Undefined = 0,
> - esxVI_Occurence_RequiredItem,
> - esxVI_Occurence_OptionalItem,
> - esxVI_Occurence_List
> +enum _esxVI_Occurrence {
> + esxVI_Occurrence_Undefined = 0,
> + esxVI_Occurrence_RequiredItem,
> + esxVI_Occurrence_OptionalItem,
> + esxVI_Occurrence_List
> };
>
>
> @@ -254,7 +254,7 @@ int esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
> const unsigned char *uuid,
> esxVI_String *propertyNameList,
> esxVI_ObjectContent **virtualMachine,
> - esxVI_Occurence occurence);
> + esxVI_Occurrence occurrence);
>
> int esxVI_LookupVirtualMachineByUuidAndPrepareForTask
> (virConnectPtr conn, esxVI_Context *ctx, const unsigned char *uuid,
> @@ -265,7 +265,7 @@ int esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
> const char *name,
> esxVI_String *propertyNameList,
> esxVI_ObjectContent **datastore,
> - esxVI_Occurence occurence);
> + esxVI_Occurrence occurrence);
>
> int esxVI_LookupTaskInfoByTask(virConnectPtr conn, esxVI_Context *ctx,
> esxVI_ManagedObjectReference *task,
> diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
> index d18e56b..6f9f3a8 100644
> --- a/src/esx/esx_vi_methods.c
> +++ b/src/esx/esx_vi_methods.c
> @@ -1149,7 +1149,7 @@ esxVI_FindByUuid(virConnectPtr conn, esxVI_Context *ctx,
>
> request = virBufferContentAndReset(&buffer);
>
> - /* FIXME: Use esxVI_Occurence instead of expectList */
> + /* FIXME: Use esxVI_Occurrence instead of expectList */
> if (esxVI_Context_Execute(conn, ctx, request,
> ESX_VI__SOAP__RESPONSE_XPATH("FindByUuid"),
> &response, esxVI_Boolean_True) < 0) {
> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
> index f5b4544..aaf14c2 100644
> --- a/src/esx/esx_vmx.c
> +++ b/src/esx/esx_vmx.c
> @@ -608,7 +608,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn,
> if (ctx != NULL) {
> if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName,
> NULL, &datastore,
> - esxVI_Occurence_OptionalItem) < 0) {
> + esxVI_Occurrence_OptionalItem) < 0) {
> goto failure;
> }
>
> --
> 1.6.0.4
>
Trivial, ACK,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list