mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-27 19:11:16 +00:00
ESX: Fallback to the preliminary name if the datastore cannot be found.
This allows to use domain-xml-from-native with VMX files that reference unavailable datastores. * src/esx/esx_vmx.c: fallback to the preliminary name if the datastore cannot be found
This commit is contained in:
parent
fc8d199188
commit
b7abcf9d71
@ -606,34 +606,37 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn,
|
||||
if (ctx != NULL) {
|
||||
if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName,
|
||||
NULL, &datastore,
|
||||
esxVI_Occurence_RequiredItem) < 0) {
|
||||
esxVI_Occurence_OptionalItem) < 0) {
|
||||
goto failure;
|
||||
}
|
||||
|
||||
for (dynamicProperty = datastore->propSet; dynamicProperty != NULL;
|
||||
dynamicProperty = dynamicProperty->_next) {
|
||||
if (STREQ(dynamicProperty->name, "summary.accessible")) {
|
||||
/* Ignore it */
|
||||
} else if (STREQ(dynamicProperty->name, "summary.name")) {
|
||||
if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val,
|
||||
esxVI_Type_String) < 0) {
|
||||
goto failure;
|
||||
}
|
||||
if (datastore != NULL) {
|
||||
for (dynamicProperty = datastore->propSet; dynamicProperty != NULL;
|
||||
dynamicProperty = dynamicProperty->_next) {
|
||||
if (STREQ(dynamicProperty->name, "summary.accessible")) {
|
||||
/* Ignore it */
|
||||
} else if (STREQ(dynamicProperty->name, "summary.name")) {
|
||||
if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val,
|
||||
esxVI_Type_String) < 0) {
|
||||
goto failure;
|
||||
}
|
||||
|
||||
datastoreName = dynamicProperty->val->string;
|
||||
break;
|
||||
} else if (STREQ(dynamicProperty->name, "summary.url")) {
|
||||
/* Ignore it */
|
||||
} else {
|
||||
VIR_WARN("Unexpected '%s' property", dynamicProperty->name);
|
||||
datastoreName = dynamicProperty->val->string;
|
||||
break;
|
||||
} else if (STREQ(dynamicProperty->name, "summary.url")) {
|
||||
/* Ignore it */
|
||||
} else {
|
||||
VIR_WARN("Unexpected '%s' property", dynamicProperty->name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (datastoreName == NULL) {
|
||||
ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
|
||||
"Could not retrieve datastore name for absolute path '%s'",
|
||||
absolutePath);
|
||||
goto failure;
|
||||
VIR_WARN("Could not retrieve datastore name for absolute "
|
||||
"path '%s', falling back to preliminary name '%s'",
|
||||
absolutePath, preliminaryDatastoreName);
|
||||
|
||||
datastoreName = preliminaryDatastoreName;
|
||||
}
|
||||
} else {
|
||||
datastoreName = preliminaryDatastoreName;
|
||||
|
Loading…
Reference in New Issue
Block a user