External/libvirt
1
0
Fork 0
Code

esx: Fix occurence typo

Browse Source
This commit is contained in:
Matthias Bolte 2009-11-22 21:18:45 +01:00
parent 49e261d14e
commit cf54204e27
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/esx/esx_driver.c
View File

@ -1158,7 +1158,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
"runtime.powerState\0") < 0 || "runtime.powerState\0") < 0 ||
esxVI_LookupVirtualMachineByUuid(conn, priv->host, uuid, esxVI_LookupVirtualMachineByUuid(conn, priv->host, uuid,
propertyNameList, &virtualMachine, propertyNameList, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachineIdentity(conn, virtualMachine, esxVI_GetVirtualMachineIdentity(conn, virtualMachine,
&id, &name, NULL) < 0 || &id, &name, NULL) < 0 ||
esxVI_GetVirtualMachinePowerState(conn, virtualMachine, esxVI_GetVirtualMachinePowerState(conn, virtualMachine,
@ -1415,7 +1415,7 @@ esxDomainShutdown(virDomainPtr domain)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine, esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
&powerState) < 0) { &powerState) < 0) {
goto failure; goto failure;
@ -1464,7 +1464,7 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine, esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
&powerState) < 0) { &powerState) < 0) {
goto failure; goto failure;
@ -1587,7 +1587,7 @@ esxDomainGetMaxMemory(virDomainPtr domain)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0) { esxVI_Occurrence_RequiredItem) < 0) {
goto failure; goto failure;
} }
@ -1771,7 +1771,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0) { esxVI_Occurrence_RequiredItem) < 0) {
goto failure; goto failure;
} }
@ -2159,7 +2159,7 @@ esxDomainDumpXML(virDomainPtr domain, int flags)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0) { esxVI_Occurrence_RequiredItem) < 0) {
goto failure; goto failure;
} }
@ -2497,7 +2497,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED)
/* Check if an existing domain should be edited */ /* Check if an existing domain should be edited */
if (esxVI_LookupVirtualMachineByUuid(conn, priv->host, def->uuid, NULL, if (esxVI_LookupVirtualMachineByUuid(conn, priv->host, def->uuid, NULL,
&virtualMachine, &virtualMachine,
esxVI_Occurence_OptionalItem) < 0) { esxVI_Occurrence_OptionalItem) < 0) {
goto failure; goto failure;
} }
@ -2686,7 +2686,7 @@ esxDomainUndefine(virDomainPtr domain)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine, esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
&powerState) < 0) { &powerState) < 0) {
goto failure; goto failure;
@ -2794,7 +2794,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain,
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0) { esxVI_Occurrence_RequiredItem) < 0) {
goto failure; goto failure;
} }
@ -3332,7 +3332,7 @@ esxDomainIsActive(virDomainPtr domain)
esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host, esxVI_LookupVirtualMachineByUuid(domain->conn, priv->host,
domain->uuid, propertyNameList, domain->uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine, esxVI_GetVirtualMachinePowerState(domain->conn, virtualMachine,
&powerState) < 0) { &powerState) < 0) {
goto failure; goto failure;

14
src/esx/esx_vi.c
View File

@ -1803,7 +1803,7 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
const unsigned char *uuid, const unsigned char *uuid,
esxVI_String *propertyNameList, esxVI_String *propertyNameList,
esxVI_ObjectContent **virtualMachine, esxVI_ObjectContent **virtualMachine,
esxVI_Occurence occurence) esxVI_Occurrence occurrence)
{ {
int result = 0; int result = 0;
esxVI_ManagedObjectReference *managedObjectReference = NULL; esxVI_ManagedObjectReference *managedObjectReference = NULL;
@ -1820,7 +1820,7 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
} }
if (managedObjectReference == NULL) { if (managedObjectReference == NULL) {
if (occurence == esxVI_Occurence_OptionalItem) { if (occurrence == esxVI_Occurrence_OptionalItem) {
return 0; return 0;
} else { } else {
virUUIDFormat(uuid, uuid_string); virUUIDFormat(uuid, uuid_string);
@ -1870,7 +1870,7 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask
esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid, esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid,
completePropertyNameList, completePropertyNameList,
virtualMachine, virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachineQuestionInfo(conn, *virtualMachine, esxVI_GetVirtualMachineQuestionInfo(conn, *virtualMachine,
&questionInfo) < 0 || &questionInfo) < 0 ||
esxVI_LookupPendingTaskInfoListByVirtualMachine esxVI_LookupPendingTaskInfoListByVirtualMachine
@ -1909,7 +1909,7 @@ int
esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx, esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
const char *name, esxVI_String *propertyNameList, const char *name, esxVI_String *propertyNameList,
esxVI_ObjectContent **datastore, esxVI_ObjectContent **datastore,
esxVI_Occurence occurence) esxVI_Occurrence occurrence)
{ {
int result = 0; int result = 0;
esxVI_String *completePropertyNameList = NULL; esxVI_String *completePropertyNameList = NULL;
@ -1943,7 +1943,7 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
} }
if (datastoreList == NULL) { if (datastoreList == NULL) {
if (occurence == esxVI_Occurence_OptionalItem) { if (occurrence == esxVI_Occurrence_OptionalItem) {
goto cleanup; goto cleanup;
} else { } else {
ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, 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) { if (numInaccessibleDatastores > 0) {
ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
"Could not find datastore '%s', maybe it's " "Could not find datastore '%s', maybe it's "
@ -2196,7 +2196,7 @@ esxVI_LookupAndHandleVirtualMachineQuestion(virConnectPtr conn,
"runtime.question") < 0 || "runtime.question") < 0 ||
esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid, propertyNameList, esxVI_LookupVirtualMachineByUuid(conn, ctx, uuid, propertyNameList,
&virtualMachine, &virtualMachine,
esxVI_Occurence_RequiredItem) < 0 || esxVI_Occurrence_RequiredItem) < 0 ||
esxVI_GetVirtualMachineQuestionInfo(conn, virtualMachine, esxVI_GetVirtualMachineQuestionInfo(conn, virtualMachine,
&questionInfo) < 0) { &questionInfo) < 0) {
goto failure; goto failure;

16
src/esx/esx_vi.h
View File

@ -33,7 +33,7 @@
typedef enum _esxVI_APIVersion esxVI_APIVersion; typedef enum _esxVI_APIVersion esxVI_APIVersion;
typedef enum _esxVI_ProductVersion esxVI_ProductVersion; 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_Context esxVI_Context;
typedef struct _esxVI_Response esxVI_Response; typedef struct _esxVI_Response esxVI_Response;
typedef struct _esxVI_Enumeration esxVI_Enumeration; typedef struct _esxVI_Enumeration esxVI_Enumeration;
@ -58,11 +58,11 @@ enum _esxVI_ProductVersion {
esxVI_ProductVersion_VPX40 esxVI_ProductVersion_VPX40
}; };
enum _esxVI_Occurence { enum _esxVI_Occurrence {
esxVI_Occurence_Undefined = 0, esxVI_Occurrence_Undefined = 0,
esxVI_Occurence_RequiredItem, esxVI_Occurrence_RequiredItem,
esxVI_Occurence_OptionalItem, esxVI_Occurrence_OptionalItem,
esxVI_Occurence_List esxVI_Occurrence_List
}; };
@ -254,7 +254,7 @@ int esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx,
const unsigned char *uuid, const unsigned char *uuid,
esxVI_String *propertyNameList, esxVI_String *propertyNameList,
esxVI_ObjectContent **virtualMachine, esxVI_ObjectContent **virtualMachine,
esxVI_Occurence occurence); esxVI_Occurrence occurrence);
int esxVI_LookupVirtualMachineByUuidAndPrepareForTask int esxVI_LookupVirtualMachineByUuidAndPrepareForTask
(virConnectPtr conn, esxVI_Context *ctx, const unsigned char *uuid, (virConnectPtr conn, esxVI_Context *ctx, const unsigned char *uuid,
@ -265,7 +265,7 @@ int esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx,
const char *name, const char *name,
esxVI_String *propertyNameList, esxVI_String *propertyNameList,
esxVI_ObjectContent **datastore, esxVI_ObjectContent **datastore,
esxVI_Occurence occurence); esxVI_Occurrence occurrence);
int esxVI_LookupTaskInfoByTask(virConnectPtr conn, esxVI_Context *ctx, int esxVI_LookupTaskInfoByTask(virConnectPtr conn, esxVI_Context *ctx,
esxVI_ManagedObjectReference *task, esxVI_ManagedObjectReference *task,

2
src/esx/esx_vi_methods.c
View File

@ -1149,7 +1149,7 @@ esxVI_FindByUuid(virConnectPtr conn, esxVI_Context *ctx,
request = virBufferContentAndReset(&buffer); request = virBufferContentAndReset(&buffer);
/* FIXME: Use esxVI_Occurence instead of expectList */ /* FIXME: Use esxVI_Occurrence instead of expectList */
if (esxVI_Context_Execute(conn, ctx, request, if (esxVI_Context_Execute(conn, ctx, request,
ESX_VI__SOAP__RESPONSE_XPATH("FindByUuid"), ESX_VI__SOAP__RESPONSE_XPATH("FindByUuid"),
&response, esxVI_Boolean_True) < 0) { &response, esxVI_Boolean_True) < 0) {

2
src/esx/esx_vmx.c
View File

@ -608,7 +608,7 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn,
if (ctx != NULL) { if (ctx != NULL) {
if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName, if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName,
NULL, &datastore, NULL, &datastore,
esxVI_Occurence_OptionalItem) < 0) { esxVI_Occurrence_OptionalItem) < 0) {
goto failure; goto failure;
} }