Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1833 from jijiang/master

Browse Source 
CA-270505: Use generic msg if VM migr not allowed
This commit is contained in:
Gabor Apati-Nagy 2017-10-31 14:18:46 +00:00 committed by GitHub
commit 93935e5e48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
XenAdmin/Commands/DragDropMigrateVMCommand.cs
View File

@ -74,12 +74,7 @@ namespace XenAdmin.Commands
!draggedVM.allowed_operations.Contains(vm_operations.migrate_send))
{
if (draggedVM.power_state == vm_power_state.Running)
{
if (draggedVM.HasVGPUs())
return Messages.MIGRATION_NOT_ALLOWED_GPU;
else
return Messages.MIGRATION_NOT_ALLOWED;
}
return Messages.MIGRATION_NOT_ALLOWED;
return null;
}

9
XenModel/Messages.Designer.cs generated
View File

@ -22473,15 +22473,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to This VM may not migrate because it has a dedicated GPU.
/// </summary>
public static string MIGRATION_NOT_ALLOWED_GPU {
get {
return ResourceManager.GetString("MIGRATION_NOT_ALLOWED_GPU", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to This VM may not migrate; it is not on shared storage.
/// </summary>

3
XenModel/Messages.resx
View File

@ -7822,9 +7822,6 @@ To learn more about the [XenServer] Live VDI Migration feature or to start a [Xe
<data name="MIGRATION_NOT_ALLOWED_CPU_FEATURES" xml:space="preserve">
<value>This VM may not migrate because the destination host does not have some of the CPU features that the VM is currently using</value>
</data>
<data name="MIGRATION_NOT_ALLOWED_GPU" xml:space="preserve">
<value>This VM may not migrate because it has a dedicated GPU</value>
</data>
<data name="MIGRATION_NOT_ALLOWED_NO_SHARED_STORAGE" xml:space="preserve">
<value>This VM may not migrate; it is not on shared storage</value>
</data>